Changeset 57850 in webkit

Timestamp:

Apr 19, 2010 4:05:44 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Adam Barth.

From a patch by Tor Arne Vestbo <​tor.arne.vestbo@nokia.com>

new-run-webkit-tests: make the retry step more explicit
​https://bugs.webkit.org/show_bug.cgi?id=37606

It might be confusing to see the test and percent counters
reset without any notice of what's going on, so we make the
message that a retry-run is started explicit.

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-19  Dirk Pranke <dpranke@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        From a patch by Tor Arne Vestbo  <tor.arne.vestbo@nokia.com>
+
+        new-run-webkit-tests: make the retry step more explicit
+        https://bugs.webkit.org/show_bug.cgi?id=37606
+
+        It might be confusing to see the test and percent counters
+        reset without any notice of what's going on, so we make the
+        message that a retry-run is started explicit.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-04-19  Sam Weinig  <weinig@apple.com>
 

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

@@ -218 +218 @@
         self._current_progress_str = ""
         self._current_test_number = 0
+
+        self._retries = 0
 
     def __del__(self):
@@ -654 +656 @@
         # we want to treat even a potentially flaky crash as an error.
         failures = self._get_failures(result_summary, include_crashes=False)
-        retries = 0
         retry_summary = result_summary
-        while (retries < self.NUM_RETRY_ON_UNEXPECTED_FAILURE and
+        while (self._retries < self.NUM_RETRY_ON_UNEXPECTED_FAILURE and
                len(failures)):
-            _log.debug("Retrying %d unexpected failure(s)" % len(failures))
-            retries += 1
+            _log.info('')
+            _log.info("Retrying %d unexpected failure(s)" % len(failures))
+            _log.info('')
+            self._retries += 1
             retry_summary = ResultSummary(self._expectations, failures.keys())
             self._run_tests(failures.keys(), retry_summary)
@@ -740 +743 @@
         percent_complete = 100 * (result_summary.expected +
             result_summary.unexpected) / result_summary.total
-        self._meter.progress("Testing (%d%%): %d ran as expected, %d didn't,"
-            " %d left" % (percent_complete, result_summary.expected,
+        action = "Testing"
+        if self._retries > 0:
+            action = "Retrying"
+        self._meter.progress("%s (%d%%): %d ran as expected, %d didn't,"
+            " %d left" % (action, percent_complete, result_summary.expected,
              result_summary.unexpected, result_summary.remaining))