summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/test/main_unittest.py
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
commit8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch)
tree17985605dab9263cc2444bd4d45f189e142cca7c /Tools/Scripts/webkitpy/test/main_unittest.py
parentb9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff)
downloadqtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
Diffstat (limited to 'Tools/Scripts/webkitpy/test/main_unittest.py')
-rw-r--r--Tools/Scripts/webkitpy/test/main_unittest.py9
1 files changed, 8 insertions, 1 deletions
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, [])