Modify requires_database, includes test type in check

toolset/benchmark/framework_test.py

@@ -910,10 +910,10 @@ class FrameworkTest:
 
   def requires_database(self):
       """Returns True/False if this test requires a database"""
-      return (self.contains_type(self.FORTUNE) or 
-              self.contains_type(self.DB) or 
-              self.contains_type(self.QUERY) or
-              self.contains_type(self.UPDATE))
+      return (self.runTests[self.FORTUNE] or 
+              self.runTests[self.DB] or 
+              self.runTests[self.QUERY] or
+              self.runTests[self.UPDATE])
 
   ##########################################################################################
   # Constructor