[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 32038db1f18359d75597c52e873b53b7a15df525
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 04:55:34 2010 +0000

    2010-09-22  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Fix comm-queue typo
            https://bugs.webkit.org/show_bug.cgi?id=46339
    
            We were missing a "self".  The real problem is that we didn't have an
            integration test for the failure case.
    
            * Scripts/webkitpy/tool/commands/queues.py:
            * Scripts/webkitpy/tool/commands/queues_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68122 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3a1f44e..4424ac3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Eric Seidel.
 
+        Fix comm-queue typo
+        https://bugs.webkit.org/show_bug.cgi?id=46339
+
+        We were missing a "self".  The real problem is that we didn't have an
+        integration test for the failure case.
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
+2010-09-22  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         commit-queue should log more detailed messages to the QueueStatusServer
         https://bugs.webkit.org/show_bug.cgi?id=46333
 
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
index 6d08c71..2a1f957 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
@@ -246,7 +246,7 @@ class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler):
     def command_passed(self, message, patch):
         self._update_status(message, patch=patch)
 
-    def command_failed(message, script_error, patch):
+    def command_failed(self, message, script_error, patch):
         failure_log = self._log_from_script_error_for_upload(script_error)
         return self._update_status(message, patch=patch, results_file=failure_log)
 
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
index a62a9a0..8cf14a5 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -207,6 +207,26 @@ MOCK: update_status: commit-queue Pass
         }
         self.assert_queue_outputs(CommitQueue(), expected_stderr=expected_stderr)
 
+    def test_commit_queue_failure(self):
+        expected_stderr = {
+            "begin_work_queue": self._default_begin_work_queue_stderr("commit-queue", MockSCM.fake_checkout_root),
+            "should_proceed_with_work_item": "MOCK: update_status: commit-queue Landing patch\n",
+            "next_work_item": "",
+            "process_work_item": """MOCK: update_status: commit-queue Patch does not apply
+MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting patch 197 from commit-queue.' and additional comment 'MOCK script error'
+MOCK: update_status: commit-queue Fail
+""",
+            "handle_unexpected_error": "MOCK setting flag 'commit-queue' to '-' on attachment '197' with comment 'Rejecting patch 197 from commit-queue.' and additional comment 'Mock error message'\n",
+            "handle_script_error": "ScriptError error message\n",
+        }
+        queue = CommitQueue()
+
+        def mock_run_webkit_patch(command):
+            raise ScriptError('MOCK script error')
+
+        queue.run_webkit_patch = mock_run_webkit_patch
+        self.assert_queue_outputs(queue, expected_stderr=expected_stderr)
+
     def test_rollout(self):
         tool = MockTool(log_executive=True)
         tool.buildbot.light_tree_on_fire()

-- 
WebKit Debian packaging