Changeset 66707 in webkit

Timestamp:

Sep 2, 2010 8:16:13 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-09-02 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Add a unit test for commit-queue retries
​https://bugs.webkit.org/show_bug.cgi?id=45162

I think commit-queue retries are not correctly avoiding
build and test on retries. So I started testing the code.
Unfortunately this test did not find the bug. But now
that we have the test we might as well keep it.
I also fixed a broken import in validate-committer-lists.

• Scripts/validate-committer-lists:
• Scripts/webkitpy/tool/commands/queues_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/validate-committer-lists (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queues_unittest.py (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-02  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Add a unit test for commit-queue retries
+        https://bugs.webkit.org/show_bug.cgi?id=45162
+
+        I think commit-queue retries are not correctly avoiding
+        build and test on retries.  So I started testing the code.
+        Unfortunately this test did not find the bug.  But now
+        that we have the test we might as well keep it.
+        I also fixed a broken import in validate-committer-lists.
+
+        * Scripts/validate-committer-lists:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2010-09-02  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKitTools/Scripts/validate-committer-lists

@@ -39 +39 @@
 from webkitpy.common.config.committers import CommitterList
 from webkitpy.common.system.deprecated_logging import log, error
-from webkitpy.scm import Git
+from webkitpy.common.checkout.scm import Git
 
 # WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy

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

@@ -29 +29 @@
 import os
 
+from webkitpy.common.checkout.scm import CheckoutNeedsUpdate
 from webkitpy.common.net.bugzilla import Attachment
 from webkitpy.common.system.outputcapture import OutputCapture
@@ -35 +36 @@
 from webkitpy.tool.commands.queues import *
 from webkitpy.tool.commands.queuestest import QueuesTest
+from webkitpy.tool.commands.stepsequence import StepSequence
 from webkitpy.tool.mocktool import MockTool, MockSCM
 
@@ -134 +136 @@
 
 
+class NeedsUpdateSequence(StepSequence):
+    def _run(self, tool, options, state):
+        raise CheckoutNeedsUpdate([], 1, "", None)
+
+
+class AlwaysCommitQueueTool(object):
+    def command_by_name(self, name):
+        return CommitQueue
+
+
 class CommitQueueTest(QueuesTest):
     def test_commit_queue(self):
@@ -227 +239 @@
         self.assertEqual(attachments, expected_sort)
 
+    def test_auto_retry(self):
+        queue = CommitQueue()
+        options = Mock()
+        options.parent_command = "commit-queue"
+        tool = AlwaysCommitQueueTool()
+        sequence = NeedsUpdateSequence(None)
+
+        expected_stderr = "Commit failed because the checkout is out of date.  Please update and try again.\n"
+        OutputCapture().assert_outputs(self, sequence.run_and_handle_errors, [tool, options], expected_exception=TryAgain, expected_stderr=expected_stderr)
+
+        self.assertEquals(options.update, True)
+        self.assertEquals(options.build, False)
+        self.assertEquals(options.test, False)
+
 
 class RietveldUploadQueueTest(QueuesTest):