Changeset 65979 in webkit

Timestamp:

Aug 24, 2010 10:11:56 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-08-24 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

commit-queue and EWS bots should report all failures
​https://bugs.webkit.org/show_bug.cgi?id=41820

Right now commit-queue/EWS only report failures when the
patch under testing fails. We should report all failures
to the status server so that we can diagnose when the bots
are wedged w/o needing to log into the machines.

I also reduced the amount of data we upload since we've seen
timeouts during status upload.

• Scripts/webkitpy/common/system/executive.py:
• Scripts/webkitpy/tool/commands/earlywarningsystem.py:
• Scripts/webkitpy/tool/commands/queues.py:
• Scripts/webkitpy/tool/commands/queues_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/earlywarningsystem.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queues.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/queues_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-24  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue and EWS bots should report all failures
+        https://bugs.webkit.org/show_bug.cgi?id=41820
+
+        Right now commit-queue/EWS only report failures when the
+        patch under testing fails.  We should report all failures
+        to the status server so that we can diagnose when the bots
+        are wedged w/o needing to log into the machines.
+
+        I also reduced the amount of data we upload since we've seen
+        timeouts during status upload.
+
+        * Scripts/webkitpy/common/system/executive.py:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2010-08-24  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/system/executive.py

@@ -74 +74 @@
         if self.output:
             if output_limit and len(self.output) > output_limit:
-                return "%s\nLast %s characters of output:\n%s" % \
+                return u"%s\nLast %s characters of output:\n%s" % \
                     (self, output_limit, self.output[-output_limit:])
-            return "%s\n%s" % (self, self.output)
-        return str(self)
+            return u"%s\n%s" % (self, self.output)
+        return unicode(self)
 
     def command_name(self):

trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py

@@ -56 +56 @@
             return True
         except ScriptError, e:
-            self._update_status("Unable to perform a build")
+            failure_log = self._log_from_script_error_for_upload(e)
+            self._update_status("Unable to perform a build", results_file=failure_log)
             return False
 

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

@@ -121 +121 @@
 
     @classmethod
+    def _log_from_script_error_for_upload(cls, script_error, output_limit=None):
+        # We have seen request timeouts with app engine due to large
+        # log uploads.  Trying only the last 512k.
+        if not output_limit:
+            output_limit = 512 * 1024  # 512k
+        output = script_error.message_with_output(output_limit=output_limit)
+        # We pre-encode the string to a byte array before passing it
+        # to status_server, because ClientForm (part of mechanize)
+        # wants a file-like object with pre-encoded data.
+        return StringIO(output.encode("utf-8"))
+
+    @classmethod
     def _update_status_for_script_error(cls, tool, state, script_error, is_error=False):
         message = str(script_error)
         if is_error:
             message = "Error: %s" % message
-        output = script_error.message_with_output(output_limit=1024*1024) # 1MB
-        # We pre-encode the string to a byte array before passing it
-        # to status_server, because ClientForm (part of mechanize)
-        # wants a file-like object with pre-encoded data.
-        return tool.status_server.update_status(cls.name, message, state["patch"], StringIO(output.encode("utf-8")))
+        failure_log = cls._log_from_script_error_for_upload(script_error)
+        return tool.status_server.update_status(cls.name, message, state["patch"], failure_log)
 
 
@@ -204 +213 @@
                 "--quiet"])
         except ScriptError, e:
-            self._update_status("Unable to successfully build and test", None)
+            failure_log = self._log_from_script_error_for_upload(e)
+            self._update_status("Unable to successfully build and test", results_file=failure_log)
             return False
         return True

trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py

@@ -100 +100 @@
         self.assertTrue(queue.should_continue_work_queue())
 
+    def _assert_log_message(self, script_error, log_message):
+        failure_log = AbstractQueue._log_from_script_error_for_upload(script_error, output_limit=10)
+        self.assertTrue(failure_log.read(), log_message)
+
+    def test_log_from_script_error_for_upload(self):
+        self._assert_log_message(ScriptError("test"), "test")
+        unicode_tor = u"WebKit \u2661 Tor Arne Vestb\u00F8!"
+        utf8_tor = unicode_tor.encode("utf-8")
+        self._assert_log_message(ScriptError(unicode_tor), utf8_tor)
+        script_error = ScriptError(unicode_tor, output=unicode_tor)
+        expected_output = "%s\nLast %s characters of output:\n%s" % (utf8_tor, 10, utf8_tor[-10:])
+        self._assert_log_message(script_error, expected_output)
+
 
 class AbstractReviewQueueTest(CommandsTest):