[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b195701b86ff6951e425d677513c1e6dad614e20
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 23:57:30 2010 +0000

    2010-01-22  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Limit length of EWS results to 5MB
            https://bugs.webkit.org/show_bug.cgi?id=34016
    
            Hopefully this will fix the bug where the results link doesn't appear.
            Our current theory is that the results blob is too big and the server
            is rejecting the request with a 500 error.  That causes us to re-try
            the post, but when we re-try the StringIO buffer has its seek pointer
            at the end.
    
            * Scripts/webkitpy/commands/queues.py:
            * Scripts/webkitpy/statusserver.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2977bc7..09dee59 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-22  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Limit length of EWS results to 5MB
+        https://bugs.webkit.org/show_bug.cgi?id=34016
+
+        Hopefully this will fix the bug where the results link doesn't appear.
+        Our current theory is that the results blob is too big and the server
+        is rejecting the request with a 500 error.  That causes us to re-try
+        the post, but when we re-try the StringIO buffer has its seek pointer
+        at the end.
+
+        * Scripts/webkitpy/commands/queues.py:
+        * Scripts/webkitpy/statusserver.py:
+
 2010-01-22  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/commands/queues.py b/WebKitTools/Scripts/webkitpy/commands/queues.py
index a01f999..7035c21 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queues.py
@@ -129,7 +129,8 @@ class AbstractQueue(Command, QueueEngineDelegate):
         message = script_error.message
         if is_error:
             message = "Error: %s" % message
-        return tool.status_server.update_status(cls.name, message, state["patch"], StringIO(script_error.output))
+        output = script_error.message_with_output(limit=5*1024*1024) # 5MB
+        return tool.status_server.update_status(cls.name, message, state["patch"], StringIO(output))
 
 
 class CommitQueue(AbstractQueue, StepSequenceErrorHandler):
diff --git a/WebKitTools/Scripts/webkitpy/statusserver.py b/WebKitTools/Scripts/webkitpy/statusserver.py
index c17b162..cb6fd26 100644
--- a/WebKitTools/Scripts/webkitpy/statusserver.py
+++ b/WebKitTools/Scripts/webkitpy/statusserver.py
@@ -65,6 +65,9 @@ class StatusServer:
         self.browser.add_file(results_file, "text/plain", "results.txt", 'results_file')
 
     def _post_to_server(self, queue_name, status, patch, results_file):
+        # We might need to re-wind the file if we've already tried to post it.
+        results_file.seek(0)
+
         update_status_url = "%s/update-status" % self.url
         self.browser.open(update_status_url)
         self.browser.select_form(name="update_status")

-- 
WebKit Debian packaging