Changeset 57137 in webkit

Timestamp:

Apr 6, 2010 2:59:52 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-06 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Explain how to handle rollout patches
​https://bugs.webkit.org/show_bug.cgi?id=37139

We need to set expectations for how long landing rollout patches with
the commit-queue takes. The commit-queue is optimized for safety, not
performance. Also, give folks an alternative way to land patches
quickly.

In addition, improve our testing of add_patch_to_bug by having
MockBugzilla log. This caused me to tighten a bunch of tests and
notice that one of our tests wasn't being run.

• Scripts/webkitpy/tool/commands/download_unittest.py:
• Scripts/webkitpy/tool/commands/upload_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/steps/postdiffforrevert.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/download_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/upload_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/tool/mocktool.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/postdiffforrevert.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Explain how to handle rollout patches
+        https://bugs.webkit.org/show_bug.cgi?id=37139
+
+        We need to set expectations for how long landing rollout patches with
+        the commit-queue takes.  The commit-queue is optimized for safety, not
+        performance.  Also, give folks an alternative way to land patches
+        quickly.
+
+        In addition, improve our testing of add_patch_to_bug by having
+        MockBugzilla log.  This caused me to tighten a bunch of tests and
+        notice that one of our tests wasn't being run.
+
+        * Scripts/webkitpy/tool/commands/download_unittest.py:
+        * Scripts/webkitpy/tool/commands/upload_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/steps/postdiffforrevert.py:
+
 2010-04-06  Adam Barth  <abarth@webkit.org>
 

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

@@ -122 +122 @@
 
     def test_create_rollout(self):
-        expected_stderr = "Preparing rollout for bug 42.\nUpdating working directory\nMOCK create_bug\nbug_title: REGRESSION(r852): Reason\nbug_description: http://trac.webkit.org/changeset/852 broke the build:\nReason\nRunning prepare-ChangeLog\n"
+        expected_stderr = "Preparing rollout for bug 42.\nUpdating working directory\nMOCK create_bug\nbug_title: REGRESSION(r852): Reason\nbug_description: http://trac.webkit.org/changeset/852 broke the build:\nReason\nRunning prepare-ChangeLog\nMOCK add_patch_to_bug: bug_id=None, description=ROLLOUT of r852, mark_for_review=False, mark_for_commit_queue=True, mark_for_landing=False\n-- Begin comment --\nAny committer can land this patch automatically by marking it commit-queue+.  The commit-queue will build and test the patch before landing to ensure that the rollout will be successful.  This process takes approximately 15 minutes.\n\nIf you would like to land the rollout faster, you can use the following command:\n\n  webkit-patch land-attachment ATTACHMENT_ID --no-build --no-test --ignore-builders\n\nwhere ATTACHMENT_ID is the ID of this attachment.\n-- End comment --\n"
         self.assert_execute_outputs(CreateRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
 

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

@@ -55 +55 @@
 
     def test_post(self):
-        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\n"
-        self.assert_execute_outputs(Post(), [42], expected_stderr=expected_stderr)
+        options = Mock()
+        options.description = "MOCK description"
+        options.request_commit = False
+        options.review = True
+        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\nMOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False\n-- Begin comment --\nNone\n-- End comment --\nMOCK: user.open_url: http://example.com/42\n"
+        self.assert_execute_outputs(Post(), [42], options=options, expected_stderr=expected_stderr)
 
-    def test_post(self):
-        expected_stderr = "Obsoleting 2 old patches on bug 42\n"
+    def test_land_safely(self):
+        expected_stderr = "Obsoleting 2 old patches on bug 42\nMOCK add_patch_to_bug: bug_id=42, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True\n-- Begin comment --\nNone\n-- End comment --\n"
         self.assert_execute_outputs(LandSafely(), [42], expected_stderr=expected_stderr)
 
@@ -70 +74 @@
 
     def test_upload(self):
-        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\nMOCK: user.open_url: http://example.com/42\n"
-        self.assert_execute_outputs(Upload(), [42], expected_stderr=expected_stderr)
+        options = Mock()
+        options.description = "MOCK description"
+        options.request_commit = False
+        options.review = True
+        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\nMOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False\n-- Begin comment --\nNone\n-- End comment --\nMOCK: user.open_url: http://example.com/42\n"
+        self.assert_execute_outputs(Upload(), [42], options=options, expected_stderr=expected_stderr)
 
     def test_mark_bug_fixed(self):

trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py

@@ -296 +296 @@
             bug_id, cc, comment_text))
 
+    def add_patch_to_bug(self,
+                         bug_id,
+                         patch_file_object,
+                         description,
+                         comment_text=None,
+                         mark_for_review=False,
+                         mark_for_commit_queue=False,
+                         mark_for_landing=False):
+        log("MOCK add_patch_to_bug: bug_id=%s, description=%s, mark_for_review=%s, mark_for_commit_queue=%s, mark_for_landing=%s" %
+            (bug_id, description, mark_for_review, mark_for_commit_queue, mark_for_landing))
+        log("-- Begin comment --")
+        log(comment_text)
+        log("-- End comment --")
+
 
 class MockBuilder(object):

trunk/WebKitTools/Scripts/webkitpy/tool/steps/postdiffforrevert.py

@@ -35 +35 @@
 class PostDiffForRevert(AbstractStep):
     def run(self, state):
+        comment_text = "Any committer can land this patch automatically by \
+marking it commit-queue+.  The commit-queue will build and test \
+the patch before landing to ensure that the rollout will be \
+successful.  This process takes approximately 15 minutes.\n\n\
+If you would like to land the rollout faster, you can use the \
+following command:\n\n\
+  webkit-patch land-attachment ATTACHMENT_ID --no-build --no-test --ignore-builders\n\n\
+where ATTACHMENT_ID is the ID of this attachment."
         self._tool.bugs.add_patch_to_bug(
             state["bug_id"],
             StringIO.StringIO(self.cached_lookup(state, "diff")),
             "%s%s" % (Attachment.rollout_preamble, state["revision"]),
+            comment_text=comment_text,
             mark_for_review=False,
             mark_for_commit_queue=True)