Changeset 77341 in webkit

Timestamp:

Feb 1, 2011 5:16:29 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-02-01 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Tony Chang.

new-run-webkit-tests: add first stub of test_runner2. This
will add support for the 'inline', 'threads', and 'processes'
flags to --worker-model, but for now the implementatios just
fall back on the old ones.

​https://bugs.webkit.org/show_bug.cgi?id=53157

• Scripts/webkitpy/layout_tests/layout_package/test_runner2.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/test_runner2.py (added)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-01  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        new-run-webkit-tests: add first stub of test_runner2. This
+        will add support for the 'inline', 'threads', and 'processes'
+        flags to --worker-model, but for now the implementatios just
+        fall back on the old ones.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53157
+
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner2.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-02-01  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -40 +40 @@
 from layout_package import printing
 from layout_package import test_runner
+from layout_package import test_runner2
 
 from webkitpy.common.system import user
@@ -88 +89 @@
     num_unexpected_results = -1
     try:
-        runner = test_runner.TestRunner(port, options, printer)
+        if options.worker_model in ('inline', 'threads', 'processes'):
+            runner = test_runner2.TestRunner2(port, options, printer)
+        else:
+            runner = test_runner.TestRunner(port, options, printer)
+
         runner._print_config()
 
@@ -130 +135 @@
         options.worker_model = port_obj.default_worker_model()
 
-    if options.worker_model == 'old-inline':
+    if options.worker_model in ('inline', 'old-inline'):
         if options.child_processes and int(options.child_processes) > 1:
-            warnings.append("--worker-model=old-inline overrides --child-processes")
+            warnings.append("--worker-model=%s overrides --child-processes" % options.worker_model)
         options.child_processes = "1"
     if not options.child_processes:
@@ -370 +375 @@
         # FIXME: Display default number of child processes that will run.
         optparse.make_option("--worker-model", action="store",
-            default=None, help=("controls worker model. Valid values "
-                                "are 'old-inline', 'old-threads'.")),
+            default=None, help=("controls worker model. Valid values are 'old-inline', "
+                                "'old-threads', 'inline', 'threads', and 'processes'.")),
         optparse.make_option("--experimental-fully-parallel",
             action="store_true", default=False,

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

@@ -453 +453 @@
 
     def test_worker_model__inline(self):
+        self.assertTrue(passing_run(['--worker-model', 'inline']))
+
+    def test_worker_model__old_inline_with_child_processes(self):
+        res, out, err, user = logging_run(['--worker-model', 'old-inline',
+                                           '--child-processes', '2'])
+        self.assertEqual(res, 0)
+        self.assertTrue('--worker-model=old-inline overrides --child-processes\n' in err.get())
+
+    def test_worker_model__old_inline(self):
         self.assertTrue(passing_run(['--worker-model', 'old-inline']))
 
+    def test_worker_model__old_threads(self):
+        self.assertTrue(passing_run(['--worker-model', 'old-threads']))
+
+    def test_worker_model__processes(self):
+        self.assertRaises(ValueError, logging_run, ['--worker-model', 'processes'])
+
     def test_worker_model__threads(self):
-        self.assertTrue(passing_run(['--worker-model', 'old-threads']))
+        self.assertTrue(passing_run(['--worker-model', 'threads']))
 
     def test_worker_model__unknown(self):