Changeset 83801 in webkit

Timestamp:

Apr 13, 2011 6:37:18 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-13 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Tony Chang.

new-run-webkit-tests --run-singly option is busted
​https://bugs.webkit.org/show_bug.cgi?id=55909

Python's broken lexical scoping strikes again :(.

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

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-13  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        new-run-webkit-tests --run-singly option is busted
+        https://bugs.webkit.org/show_bug.cgi?id=55909
+
+        Python's broken lexical scoping strikes again :(.
+
+        * Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-04-13  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker_mixin.py

@@ -160 +160 @@
         """
         worker = self
-        result = None
 
         driver = worker._port.create_driver(worker._worker_number)
@@ -167 +166 @@
         class SingleTestThread(threading.Thread):
             def run(self):
-                result = worker._run_single_test(driver, test_input)
+                self.result = worker._run_single_test(driver, test_input)
 
         thread = SingleTestThread()
         thread.start()
         thread.join(thread_timeout_sec)
+        result = getattr(thread, 'result', None)
         if thread.isAlive():
             # If join() returned with the thread still running, the

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

@@ -326 +326 @@
             self.assertEquals(len(batch), 1, '%s had too many tests' % ', '.join(batch))
 
+    def test_run_singly_actually_runs_tests(self):
+        res, _, _, _ = logging_run(['--run-singly', 'failures/unexpected'])
+        self.assertEquals(res, 5)
+
     def test_single_file(self):
         tests_run = get_tests_run(['passes/text.html'], tests_included=True, flatten_batches=True)