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

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

Issue 458643003: Remove serial test support from test-webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove flaky error code check in all cases 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
« no previous file with comments | « Tools/Scripts/webkitpy/test/main.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/test/main_unittest.py
diff --git a/Tools/Scripts/webkitpy/test/main_unittest.py b/Tools/Scripts/webkitpy/test/main_unittest.py
index 94e9c91da51588494c2fa8af2ae3ca7665e100ea..8113f6931026b814a65814478749336a1d81a41d 100644
--- a/Tools/Scripts/webkitpy/test/main_unittest.py
+++ b/Tools/Scripts/webkitpy/test/main_unittest.py
@@ -41,12 +41,6 @@ class TestStubs(unittest.TestCase):
def integration_test_empty(self):
pass
- def serial_test_empty(self):
- pass
-
- def serial_integration_test_empty(self):
- pass
-
class TesterTest(unittest.TestCase):
@@ -83,29 +77,19 @@ class TesterTest(unittest.TestCase):
def test_individual_names_are_not_run_twice(self):
args = [STUBS_CLASS + '.test_empty']
- parallel_tests, serial_tests = self._find_test_names(args)
- self.assertEqual(parallel_tests, args)
- self.assertEqual(serial_tests, [])
+ tests = self._find_test_names(args)
+ self.assertEqual(tests, args)
def test_integration_tests_are_not_found_by_default(self):
- parallel_tests, serial_tests = self._find_test_names([STUBS_CLASS])
- self.assertEqual(parallel_tests, [
- STUBS_CLASS + '.test_empty',
- ])
- self.assertEqual(serial_tests, [
- STUBS_CLASS + '.serial_test_empty',
- ])
+ tests = self._find_test_names([STUBS_CLASS])
+ self.assertEqual(tests, [STUBS_CLASS + '.test_empty'])
def test_integration_tests_are_found(self):
- parallel_tests, serial_tests = self._find_test_names(['--integration-tests', STUBS_CLASS])
- self.assertEqual(parallel_tests, [
+ tests = self._find_test_names(['--integration-tests', STUBS_CLASS])
+ self.assertEqual(tests, [
STUBS_CLASS + '.integration_test_empty',
STUBS_CLASS + '.test_empty',
])
- self.assertEqual(serial_tests, [
- STUBS_CLASS + '.serial_integration_test_empty',
- STUBS_CLASS + '.serial_test_empty',
- ])
def test_coverage_works(self):
# This is awkward; by design, running test-webkitpy -c will
« no previous file with comments | « Tools/Scripts/webkitpy/test/main.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698