Changeset 72457 in webkit

Timestamp:

Nov 19, 2010 5:48:12 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2010-11-19 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

Do some minor cleanup and bug fixing.

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

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

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Do some minor cleanup and bug fixing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49777
+
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2010-11-19  Dirk Pranke  <dpranke@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py

@@ -400 +400 @@
             self._num_tests += 1
             if self._options.run_singly:
-                result = self._run_test_singly(test_input)
+                result = self._run_test_in_another_thread(test_input)
             else:
-                result = self._run_test(test_input)
+                result = self._run_test_in_this_thread(test_input)
 
             filename = test_input.filename
@@ -432 +432 @@
                 test_runner.update_summary(result_summary)
 
-    def _run_test_singly(self, test_input):
+    def _run_test_in_another_thread(self, test_input):
         """Run a test in a separate thread, enforcing a hard time limit.
 
@@ -444 +444 @@
         Returns:
           A TestResult
-
         """
         worker = SingleTestThread(self._port,
@@ -479 +478 @@
                        test_input.filename)
             result = test_results.TestResult(test_input.filename, failures=[],
-                test_run_time=0, total_time_for_all_diffs=0, time_for_diffs=0)
+                test_run_time=0, total_time_for_all_diffs=0, time_for_diffs={})
 
         return result
 
-    def _run_test(self, test_input):
+    def _run_test_in_this_thread(self, test_input):
         """Run a single test file using a shared DumpRenderTree process.
 

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

@@ -78 +78 @@
         args.extend(['passes',
                      'http/tests',
-                     'http/tests/websocket/tests',
+                     'websocket/tests',
                      'failures/expected/*'])
     options, parsed_args = run_webkit_tests.parse_args(args)
@@ -97 +97 @@
         args.extend(['passes',
                      'http/tests',
-                     'http/tests/websocket/tests',
+                     'websocket/tests',
                      'failures/expected/*'])
     options, parsed_args = run_webkit_tests.parse_args(args)