Changeset 53126 in webkit

Timestamp:

Jan 12, 2010 2:17:31 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-01-12 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

EWS should show purple when svn-apply fails
​https://bugs.webkit.org/show_bug.cgi?id=33527

• Scripts/webkitpy/commands/early_warning_system.py:
• Scripts/webkitpy/commands/queues.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/commands/early_warning_system.py (modified) (2 diffs)
• Scripts/webkitpy/commands/queues.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-12  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        EWS should show purple when svn-apply fails
+        https://bugs.webkit.org/show_bug.cgi?id=33527
+
+        * Scripts/webkitpy/commands/early_warning_system.py:
+        * Scripts/webkitpy/commands/queues.py:
+
 2010-01-12  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py

@@ -34 +34 @@
 from webkitpy.executive import ScriptError
 from webkitpy.webkitport import WebKitPort
+from webkitpy.queueengine import QueueEngine
 
 
@@ -63 +64 @@
     @classmethod
     def handle_script_error(cls, tool, state, script_error):
-        status_id = cls._update_status_for_script_error(tool, state, script_error)
-        # FIXME: This won't be right for ports that don't use build-webkit!
-        if not script_error.command_name() == "build-webkit":
-            return
+        is_svn_apply = script_error.command_name() == "svn-apply"
+        status_id = cls._update_status_for_script_error(tool, state, script_error, is_error=is_svn_apply)
+        if is_svn_apply:
+            QueueEngine.exit_after_handled_error(e)
         results_link = tool.status_server.results_url_for_status(status_id)
         message = "Attachment %s did not build on %s:\nBuild output: %s" % (state["patch"]["id"], cls.port_name, results_link)
         tool.bugs.post_comment_to_bug(state["patch"]["bug_id"], message, cc=cls.watchers)
+        exit(1)
 
 

trunk/WebKitTools/Scripts/webkitpy/commands/queues.py

@@ -125 +125 @@
 
     @classmethod
-    def _update_status_for_script_error(cls, tool, state, script_error):
-        return tool.status_server.update_status(cls.name, script_error.message, state["patch"], StringIO(script_error.output))
+    def _update_status_for_script_error(cls, tool, state, script_error, is_error=False):
+        message = script_error.output
+        if is_error:
+            message = "Error: %s" % message
+        return tool.status_server.update_status(cls.name, script_error.message, state["patch"], StringIO(message))
 
 
@@ -242 +245 @@
             self._did_pass(patch)
         except ScriptError, e:
-            self._did_fail(patch)
+            if e.exit_code != QueueEngine.handled_error_code:
+                self._did_fail(patch)
             raise e
 
@@ -269 +273 @@
     @classmethod
     def handle_script_error(cls, tool, state, script_error):
-        status_id = cls._update_status_for_script_error(tool, state, script_error)
-        if not script_error.command_name() == "check-webkit-style":
-            return
+        is_svn_apply = script_error.command_name() == "svn-apply"
+        status_id = cls._update_status_for_script_error(tool, state, script_error, is_error=is_svn_apply)
+        if is_svn_apply:
+            QueueEngine.exit_after_handled_error(e)
         message = "Attachment %s did not pass %s:\n\n%s" % (state["patch"]["id"], cls.name, script_error.message_with_output(output_limit=3*1024))
         tool.bugs.post_comment_to_bug(state["patch"]["bug_id"], message, cc=cls.watchers)
+        exit(1)