Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

2 files changed, 16 insertions, 4 deletions

diff --git a/Tools/Scripts/webkitpy/test/main.py b/Tools/Scripts/webkitpy/test/main.py
index 28de8a6e0..852413299 100644
--- a/Tools/Scripts/webkitpy/test/main.py
+++ b/Tools/Scripts/webkitpy/test/main.py
@@ -81,7 +81,7 @@ class Tester(object):
     def skip(self, names, reason, bugid):
         self.finder.skip(names, reason, bugid)
 
-    def _parse_args(self):
+    def _parse_args(self, argv=None):
         parser = optparse.OptionParser(usage='usage: %prog [options] [args...]')
         parser.add_option('-a', '--all', action='store_true', default=False,
                           help='run all the tests')
@@ -103,7 +103,7 @@ class Tester(object):
         parser.epilog = ('[args...] is an optional list of modules, test_classes, or individual tests. '
                          'If no args are given, all the tests will be run.')
 
-        return parser.parse_args()
+        return parser.parse_args(argv)
 
     def run(self):
         self._options, args = self._parse_args()
@@ -188,10 +188,15 @@ class Tester(object):
             loader.test_method_prefixes = []
 
         serial_tests = []
-        loader.test_method_prefixes.extend(['serial_test_', 'serial_integration_test_'])
+        loader.test_method_prefixes = ['serial_test_', 'serial_integration_test_']
         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)
 
     def _all_test_names(self, suite):
diff --git a/Tools/Scripts/webkitpy/test/main_unittest.py b/Tools/Scripts/webkitpy/test/main_unittest.py
index ca7ebba0e..2020f5b60 100644
--- a/Tools/Scripts/webkitpy/test/main_unittest.py
+++ b/Tools/Scripts/webkitpy/test/main_unittest.py
@@ -25,7 +25,7 @@ import unittest
 import StringIO
 
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.test.main import Tester
+from webkitpy.test.main import Tester, _Loader
 
 
 class TesterTest(unittest.TestCase):
@@ -52,3 +52,10 @@ class TesterTest(unittest.TestCase):
 
         self.assertTrue('No tests to run' in errors.getvalue())
         self.assertTrue('No tests to run' in logs)
+
+    def test_individual_names_are_not_run_twice(self):
+        tester = Tester()
+        tester._options, args = tester._parse_args(["webkitpy.test.main_unittest.TesterTest.test_no_tests_found"])
+        parallel_tests, serial_tests = tester._test_names(_Loader(), args)
+        self.assertEquals(parallel_tests, args)
+        self.assertEquals(serial_tests, [])