Remove the concept of 'integration tests' from test-webkitpy.

Tools/Scripts/webkitpy/test/main.py

 # Copyright (C) 2012 Google, Inc.
 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1.  Redistributions of source code must retain the above copyright
 #     notice, this list of conditions and the following disclaimer.
 # 2.  Redistributions in binary form must reproduce the above copyright
 #     notice, this list of conditions and the following disclaimer in the
@@ skipping 76 matching lines @@
 
     def skip(self, names, reason, bugid):
         self.finder.skip(names, reason, bugid)
 
     def _parse_args(self, argv):
         parser = optparse.OptionParser(usage='usage: %prog [options] [args...]')
         parser.add_option('-a', '--all', action='store_true', default=False,
                           help='run all the tests')
         parser.add_option('-c', '--coverage', action='store_true', default=False,
                           help='generate code coverage info')
-        parser.add_option('-i', '--integration-tests', action='store_true', default=False,
-                          help='run integration tests as well as unit tests'),
         parser.add_option('-j', '--child-processes', action='store', type='int', default=(1 if sys.platform == 'win32' else multiprocessing.cpu_count()),
                           help='number of tests to run in parallel (default=%default)')
         parser.add_option('-p', '--pass-through', action='store_true', default=False,
                           help='be debugger friendly by passing captured output through to the system')
         parser.add_option('-q', '--quiet', action='store_true', default=False,
                           help='run quietly (errors, warnings, and progress only)')
         parser.add_option('-t', '--timing', action='store_true', default=False,
                           help='display per-test execution time (implies --verbose)')
         parser.add_option('-v', '--verbose', action='count', default=0,
                           help='verbose output (specify once for individual test results, twice for debug messages)')
@@ skipping 50 matching lines @@
         if not exit_code:
             exit_code = self.executive.call(prefix_cmd + ['report', '--omit', 'webkitpy/thirdparty/*,/usr/*,/Library/*'], cwd=script_dir, env=env)
         return (exit_code == 0)
 
     def _run_tests(self, names):
         self.printer.write_update("Checking imports ...")
         if not self._check_imports(names):
             return False
 
         self.printer.write_update("Finding the individual test methods ...")
-        loader = _Loader()
-        parallel_tests = self._test_names(loader, names)
+        loader = unittest.TestLoader()
+        tests = self._test_names(loader, names)
 
         self.printer.write_update("Running the tests ...")
-        self.printer.num_tests = len(parallel_tests)
+        self.printer.num_tests = len(tests)
         start = time.time()
         test_runner = Runner(self.printer, loader, self.webkit_finder)
-        test_runner.run(parallel_tests, self._options.child_processes)
+        test_runner.run(tests, self._options.child_processes)
 
         self.printer.print_result(time.time() - start)
 
         return not self.printer.num_errors and not self.printer.num_failures
 
     def _check_imports(self, names):
         for name in names:
             if self.finder.is_module(name):
                 # if we failed to load a name and it looks like a module,
                 # try importing it directly, because loadTestsFromName()
                 # produces lousy error messages for bad modules.
                 try:
                     __import__(name)
                 except ImportError:
                     _log.fatal('Failed to import %s:' % name)
                     self._log_exception()
                     return False
         return True
 
     def _test_names(self, loader, names):
-        parallel_test_method_prefixes = ['test_']
-        if self._options.integration_tests:
-            parallel_test_method_prefixes.append('integration_test_')
-
-        parallel_tests = []
-        loader.test_method_prefixes = parallel_test_method_prefixes
+        tests = []
         for name in names:
-            parallel_tests.extend(self._all_test_names(loader.loadTestsFromName(name, None)))
-
-        return parallel_tests
+            tests.extend(self._all_test_names(loader.loadTestsFromName(name, None)))
+        return tests
 
     def _all_test_names(self, suite):
         names = []
         if hasattr(suite, '_tests'):
             for t in suite._tests:
                 names.extend(self._all_test_names(t))
         else:
             names.append(unit_test_name(suite))
         return names
 
     def _log_exception(self):
         s = StringIO.StringIO()
         traceback.print_exc(file=s)
         for l in s.buflist:
             _log.error('  ' + l.rstrip())
 
 
-class _Loader(unittest.TestLoader):
-    test_method_prefixes = []
-
-    def getTestCaseNames(self, testCaseClass):
-        def isTestMethod(attrname, testCaseClass=testCaseClass):
-            if not hasattr(getattr(testCaseClass, attrname), '__call__'):
-                return False
-            return (any(attrname.startswith(prefix) for prefix in self.test_method_prefixes))
-        testFnNames = filter(isTestMethod, dir(testCaseClass))
-        testFnNames.sort()
-        return testFnNames
-
 
 if __name__ == '__main__':
     sys.exit(main())