Changeset 52180 in webkit

Timestamp:

Dec 15, 2009 3:47:58 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-15 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

bugzilla-tool / commit-queue should add results links to bugs when more results are available on the status bot
​https://bugs.webkit.org/show_bug.cgi?id=32546

You can see an example of this working in:
​https://bugs.webkit.org/show_bug.cgi?id=32585#c3

• QueueStatusServer/queue_status.py:
  • Output the id of the newly created status.
• Scripts/modules/commands/queues.py:
  • Tweak the commit-queue logging to include a full status link.
• Scripts/modules/statusbot.py:
  • update_status should return the newly created status id.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QueueStatusServer/queue_status.py (modified) (1 diff)
• Scripts/modules/commands/queues.py (modified) (1 diff)
• Scripts/modules/statusbot.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-15  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        bugzilla-tool / commit-queue should add results links to bugs when more results are available on the status bot
+        https://bugs.webkit.org/show_bug.cgi?id=32546
+
+        You can see an example of this working in:
+        https://bugs.webkit.org/show_bug.cgi?id=32585#c3
+
+        * QueueStatusServer/queue_status.py:
+         - Output the id of the newly created status.
+        * Scripts/modules/commands/queues.py:
+         - Tweak the commit-queue logging to include a full status link.
+        * Scripts/modules/statusbot.py:
+         - update_status should return the newly created status id.
+
 2009-12-15  Andras Becsi  <abecsi@inf.u-szeged.hu>
 

trunk/WebKitTools/QueueStatusServer/queue_status.py

@@ -148 +148 @@
         queue_status.results_file = db.Blob(str(results_file))
         queue_status.put()
-        self.redirect('/')
+        self.response.out.write(queue_status.key().id())
 
 

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

@@ -146 +146 @@
     # StepSequenceErrorHandler methods
 
+    @staticmethod
+    def _error_message_for_bug(tool, status_id, script_error):
+        if not script_error.output:
+            return script_error.message_with_output()
+        results_link = tool.status_bot.results_url_for_status(status_id)
+        return "%s\nFull output: %s" % (script_error.message_with_output(), results_link)
+
     @classmethod
     def handle_script_error(cls, tool, state, script_error):
         patch = state["patch"]
-        tool.status_bot.update_status(cls.name, "patch %s failed: %s" % (patch['id'], script_error.message), patch, StringIO(script_error.output))
-        tool.bugs.reject_patch_from_commit_queue(patch["id"], script_error.message_with_output())
+        status_id = tool.status_bot.update_status(cls.name, "patch %s failed: %s" % (patch['id'], script_error.message), patch, StringIO(script_error.output))
+        tool.bugs.reject_patch_from_commit_queue(patch["id"], cls._error_message_for_bug(tool, status_id, script_error))
 
 

trunk/WebKitTools/Scripts/modules/statusbot.py

@@ -63 +63 @@
         self.statusbot_server_url = "http://%s" % self.statusbot_host
 
+    def results_url_for_status(self, status_id):
+        return "%s/results/%s" % (self.statusbot_server_url, status_id)
+
     def update_status(self, queue_name, status, patch=None, results_file=None):
         # During unit testing, statusbot_host is None
@@ -81 +84 @@
         if results_file:
             self.browser.add_file(results_file, "text/plain", "results.txt", 'results_file')
-        self.browser.submit()
+        response = self.browser.submit()
+        return response.read() # This is the id of the newly created status object.
 
     def patch_status(self, queue_name, patch_id):