Remove deprecated contains_type method

toolset/benchmark/benchmarker.py

@@ -506,11 +506,6 @@ class Benchmarker:
       if self.exclude != None and test.name in self.exclude:
         out.write("Test {name} has been added to the excludes list. Skipping.\n".format(name=test.name))
         return exit_with_code(0)
-      
-      # If the test does not contain an implementation of the current test-type, skip it
-      if self.type != 'all' and not test.contains_type(self.type):
-        out.write("Test type {type} does not contain an implementation of the current test-type. Skipping.\n".format(type=self.type))
-        return exit_with_code(0)
 
       out.write("test.os.lower() = {os}  test.database_os.lower() = {dbos}\n".format(os=test.os.lower(),dbos=test.database_os.lower()))
       out.write("self.results['frameworks'] != None: {val}\n".format(val=str(self.results['frameworks'] != None)))

toolset/benchmark/framework_test.py

@@ -720,33 +720,6 @@ class FrameworkTest:
   # End verify_urls
   ############################################################
 
-  ############################################################
-  # contains_type(type)
-  # true if this test contains an implementation of the given 
-  # test type (json, db, etc.)
-  ############################################################
-  def contains_type(self, type):
-    try:
-      if type == self.JSON and self.json_url is not None:
-        return True
-      if type == self.DB and self.db_url is not None:
-        return True
-      if type == self.QUERY and self.query_url is not None:
-        return True
-      if type == self.FORTUNE and self.fortune_url is not None:
-        return True
-      if type == self.UPDATE and self.update_url is not None:
-        return True
-      if type == self.PLAINTEXT and self.plaintext_url is not None:
-        return True
-    except AttributeError:
-      pass
-      
-    return False
-  ############################################################
-  # End stop
-  ############################################################
-
   ############################################################
   # benchmark
   # Runs the benchmark for each type of test that it implements