Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1837)

Unified Diff: Tools/Scripts/webkitpy/test/main.py

Issue 458643003: Remove serial test support from test-webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Tools/Scripts/webkitpy/test/main.py
diff --git a/Tools/Scripts/webkitpy/test/main.py b/Tools/Scripts/webkitpy/test/main.py
index d5db7835fbca263d835d8b5451f366eb83da6c1d..c9d68a3f026b39b1017f82e987f2798ceb787103 100644
--- a/Tools/Scripts/webkitpy/test/main.py
+++ b/Tools/Scripts/webkitpy/test/main.py
@@ -165,14 +165,13 @@ class Tester(object):
self.printer.write_update("Finding the individual test methods ...")
loader = _Loader()
- parallel_tests, serial_tests = self._test_names(loader, names)
+ parallel_tests = self._test_names(loader, names)
self.printer.write_update("Running the tests ...")
- self.printer.num_tests = len(parallel_tests) + len(serial_tests)
+ self.printer.num_tests = len(parallel_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(serial_tests, 1)
self.printer.print_result(time.time() - start)
@@ -194,24 +193,13 @@ class Tester(object):
def _test_names(self, loader, names):
parallel_test_method_prefixes = ['test_']
- serial_test_method_prefixes = ['serial_test_']
parallel_tests = []
loader.test_method_prefixes = parallel_test_method_prefixes
for name in names:
parallel_tests.extend(self._all_test_names(loader.loadTestsFromName(name, None)))
- serial_tests = []
- loader.test_method_prefixes = serial_test_method_prefixes
- for name in names:
- serial_tests.extend(self._all_test_names(loader.loadTestsFromName(name, None)))
-
- # loader.loadTestsFromName() will not verify that names begin with one of the test_method_prefixes
- # if the names were explicitly provided (e.g., MainTest.test_basic), so this means that any individual
- # tests will be included in both parallel_tests and serial_tests, and we need to de-dup them.
- serial_tests = list(set(serial_tests).difference(set(parallel_tests)))
-
- return (parallel_tests, serial_tests)
+ return parallel_tests
def _all_test_names(self, suite):
names = []

Powered by Google App Engine
This is Rietveld 408576698