Changeset 85509 in webkit

Timestamp:

May 2, 2011 1:02:52 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-02 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

EWS should report the list of unexpected failures
​https://bugs.webkit.org/show_bug.cgi?id=59923

We cache the results of the first layout test results run on the task
so the EWS can grab them later. Another option is to include them in
the exception that's thrown, but this approach seemed slightly more
aesthetic.

• Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
• Scripts/webkitpy/tool/bot/patchanalysistask.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/patchanalysistask.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-02  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        EWS should report the list of unexpected failures
+        https://bugs.webkit.org/show_bug.cgi?id=59923
+
+        We cache the results of the first layout test results run on the task
+        so the EWS can grab them later.  Another option is to include them in
+        the exception that's thrown, but this approach seemed slightly more
+        aesthetic.
+
+        * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+        * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+
 2011-05-02  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

@@ -115 +115 @@
         if not expected_exception:
             self.assertEqual(success, not expect_retry)
+        return task
 
     def test_success_case(self):
@@ -443 +444 @@
 command_failed: failure_message='Unable to pass tests without patch (tree is red?)' script_error='MOCK clean test failure' patch='197'
 """
-        self._run_through_task(commit_queue, expected_stderr, ScriptError)
+        task = self._run_through_task(commit_queue, expected_stderr, ScriptError)
+        self.assertEqual(task.results_from_patch_test_run(task._patch).failing_tests(), ["foo.html", "bar.html"])
 
     def test_land_failure(self):

trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py

@@ -67 +67 @@
         self._script_error = None
         self._results_archive_from_patch_test_run = None
+        self._results_from_patch_test_run = None
         self._expected_failures = delegate.expected_failures()
         assert(self._expected_failures)
@@ -209 +210 @@
         if self._build_and_test_without_patch():
             # The error from the previous ._test() run is real, report it.
-            return self.report_failure(first_results_archive)
+            return self.report_failure(first_results_archive, first_results)
 
         clean_tree_results = self._delegate.layout_test_results()
@@ -221 +222 @@
         # tell if our original failures were unexpected and fail the patch if necessary.
         if self._expected_failures.unexpected_failures(first_results):
-            return self.report_failure(first_results_archive)
+            return self.report_failure(first_results_archive, first_results)
 
         # We don't know what's going on.  The tree is likely very red (beyond our layout-test-results
@@ -231 +232 @@
         return self._results_archive_from_patch_test_run
 
-    def report_failure(self, results_archive=None):
+    def results_from_patch_test_run(self, patch):
+        assert(self._patch.id() == patch.id())  # PatchAnalysisTask is not currently re-useable.
+        return self._results_from_patch_test_run
+
+    def report_failure(self, results_archive=None, results=None):
         if not self.validate():
             return False
         self._results_archive_from_patch_test_run = results_archive
+        self._results_from_patch_test_run = results
         raise self._script_error