Changeset 112181 in webkit

Timestamp:

Mar 26, 2012 5:12:49 PM (12 years ago)

Author:

mhahnenberg@apple.com

Message:

NRWT should retry failures serially
​https://bugs.webkit.org/show_bug.cgi?id=82241

Reviewed by Dirk Pranke.

• Scripts/webkitpy/layout_tests/controllers/manager.py:

(Manager._run_tests): Add another parameter to specify the number of workers to use.
(Manager.run): Run the failures serially.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-26  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        NRWT should retry failures serially
+        https://bugs.webkit.org/show_bug.cgi?id=82241
+
+        Reviewed by Dirk Pranke.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._run_tests): Add another parameter to specify the number of workers to use.
+        (Manager.run): Run the failures serially.
+
 2012-03-26  Adrienne Walker  <enne@google.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -708 +708 @@
                 (num_workers, driver_name, num_shards, num_locked_shards))
 
-    def _run_tests(self, file_list, result_summary):
+    def _run_tests(self, file_list, result_summary, num_workers):
         """Runs the tests in the file_list.
 
@@ -749 +749 @@
             self.start_servers_with_lock()
 
-        num_workers = min(int(self._options.child_processes), len(all_shards))
+        num_workers = min(num_workers, len(all_shards))
         self._log_num_workers(num_workers, len(all_shards), len(locked_shards))
 
@@ -895 +895 @@
         start_time = time.time()
 
-        interrupted, keyboard_interrupted, thread_timings, test_timings, individual_test_timings = self._run_tests(self._test_files_list, result_summary)
+        interrupted, keyboard_interrupted, thread_timings, test_timings, individual_test_timings = self._run_tests(self._test_files_list, result_summary, int(self._options.child_processes))
 
         # We exclude the crashes from the list of results to retry, because
@@ -908 +908 @@
             retry_summary = ResultSummary(self._expectations, failures.keys())
             # Note that we intentionally ignore the return value here.
-            self._run_tests(failures.keys(), retry_summary)
+            self._run_tests(failures.keys(), retry_summary, num_workers=1)
             failures = self._get_failures(retry_summary, include_crashes=True, include_missing=True)