Changeset 80284 in webkit

Timestamp:

Mar 3, 2011 2:18:54 PM (13 years ago)

Author:

mihaip@chromium.org

Message:

2011-03-03 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Tony Chang.

NRWT: AttributeError: TestRunner2 instance has no attribute '_cancel_workers'
​https://bugs.webkit.org/show_bug.cgi?id=55694

Fixes for interruptions in NRWT:

• Make TestRunInterruptedException be pickleable correctly (the base Exception class defines a reduce that does not include the reason)
• Fix ordering of returned arguments from TestRunner2._run_tests (interrupted and keyboard_interrupted were reversed)
• Fix cancel_workers callsites (was using old name).
• In handle_exception re-raise actual exception instance that was thrown

• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
• Scripts/webkitpy/layout_tests/layout_package/test_runner2.py:
• Scripts/webkitpy/layout_tests/layout_package/worker.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_runner.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/test_runner2.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/layout_package/worker.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-03  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        NRWT: AttributeError: TestRunner2 instance has no attribute '_cancel_workers'
+        https://bugs.webkit.org/show_bug.cgi?id=55694
+        
+        Fixes for interruptions in NRWT:
+        - Make TestRunInterruptedException be pickleable correctly (the base
+          Exception class defines a __reduce__ that does not include the reason)
+        - Fix ordering of returned arguments from TestRunner2._run_tests
+          (interrupted and keyboard_interrupted were reversed)
+        - Fix cancel_workers callsites (was using old name).
+        - In handle_exception re-raise actual exception instance that was thrown
+
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner2.py:
+        * Scripts/webkitpy/layout_tests/layout_package/worker.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-03-03  Qi Zhang  <qi.2.zhang@nokia.com>
 

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

@@ -163 +163 @@
     def __init__(self, reason):
         self.reason = reason
+
+    def __reduce__(self):
+        return self.__class__, (self.reason,)
 
 

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

@@ -101 +101 @@
         """Runs the tests in the file_list.
 
-        Return: A tuple (keyboard_interrupted, thread_timings, test_timings,
-            individual_test_timings)
+        Return: A tuple (interrupted, keyboard_interrupted, thread_timings,
+            test_timings, individual_test_timings)
+            interrupted is whether the run was interrupted
             keyboard_interrupted is whether someone typed Ctrl^C
             thread_timings is a list of dicts with the total runtime
@@ -178 +179 @@
         except KeyboardInterrupt:
             _log.info("Interrupted, exiting")
-            self._cancel_workers()
+            self.cancel_workers()
             keyboard_interrupted = True
         except test_runner.TestRunInterruptedException, e:
             _log.info(e.reason)
-            self._cancel_workers()
+            self.cancel_workers()
             interrupted = True
         except:
@@ -192 +193 @@
 
         # FIXME: should this be a class instead of a tuple?
-        return (keyboard_interrupted, interrupted, thread_timings,
+        return (interrupted, keyboard_interrupted, thread_timings,
                 self._group_stats, self._all_results)
 
@@ -209 +210 @@
 
     def handle_exception(self, source, exception_info):
-        raise exception_info
+        exception_type, exception_value, exception_traceback = exception_info
+        raise exception_type, exception_value, exception_traceback
 
     def handle_finished_list(self, source, list_name, num_tests, elapsed_time):

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

@@ -83 +83 @@
             _log.debug("%s done%s" % (self._name, exception_msg))
             if exception_msg:
-                exc_info = sys.exc_info()
-                stack_utils.log_traceback(_log.error, exc_info[2])
+                exception_type, exception_value, exception_traceback = sys.exc_info()
+                stack_utils.log_traceback(_log.error, exception_traceback)
                 # FIXME: Figure out how to send a message with a traceback.
                 self._worker_connection.post_message('exception',
-                    (exc_info[0], exc_info[1], None))
+                    (exception_type, exception_value, None))
             self._worker_connection.post_message('done')
 

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

@@ -237 +237 @@
             ['failures/expected/keyboard.html'], tests_included=True)
 
+    def test_keyboard_interrupt_inline_worker_model(self):
+        self.assertRaises(KeyboardInterrupt, logging_run,
+            ['failures/expected/keyboard.html', '--worker-model', 'inline'],
+            tests_included=True)
+
     def test_last_results(self):
         fs = port.unit_test_filesystem()
@@ -416 +421 @@
             flatten_batches=True)
         self.assertEquals(['failures/expected/crash.html', 'passes/text.html'], tests_run)
+
+    def test_exit_after_n_crashes_inline_worker_model(self):
+        tests_run = get_tests_run([
+                'failures/unexpected/timeout.html',
+                'passes/text.html',
+                '--exit-after-n-crashes-or-timeouts', '1',
+                '--worker-model', 'inline',
+            ],
+            tests_included=True,
+            flatten_batches=True)
+        self.assertEquals(['failures/unexpected/timeout.html'], tests_run)
 
     def test_results_directory_absolute(self):