Changeset 57462 in webkit

Timestamp:

Apr 11, 2010 6:58:51 PM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Eric Seidel.

create-rollout copy needs to be updated to reflect removal of --no-build
​https://bugs.webkit.org/show_bug.cgi?id=37425

Removed --no-build and --no-test from the instructions because these
don't exist anymore.

• Scripts/webkitpy/tool/commands/download_unittest.py:
  • Updated the expected results to reflect the new copy.
• 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/steps/postdiffforrevert.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-11  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        create-rollout copy needs to be updated to reflect removal of --no-build
+        https://bugs.webkit.org/show_bug.cgi?id=37425
+
+        Removed --no-build and --no-test from the instructions because these
+        don't exist anymore.
+
+        * Scripts/webkitpy/tool/commands/download_unittest.py:
+            - Updated the expected results to reflect the new copy.
+        * Scripts/webkitpy/tool/steps/postdiffforrevert.py:
+
 2010-04-11  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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\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"
+        expected_stderr = """Preparing rollout for bug 42.
+Updating working directory
+MOCK create_bug
+bug_title: REGRESSION(r852): Reason
+bug_description: http://trac.webkit.org/changeset/852 broke the build:
+Reason
+Running prepare-ChangeLog
+MOCK add_patch_to_bug: bug_id=None, description=ROLLOUT of r852, mark_for_review=False, mark_for_commit_queue=True, mark_for_landing=False
+-- Begin comment --
+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.
+
+If you would like to land the rollout faster, you can use the following command:
+
+  webkit-patch land-attachment ATTACHMENT_ID --ignore-builders
+
+where ATTACHMENT_ID is the ID of this attachment.
+-- End comment --
+"""
         self.assert_execute_outputs(CreateRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
 

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

@@ -41 +41 @@
 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\
+  webkit-patch land-attachment ATTACHMENT_ID --ignore-builders\n\n\
 where ATTACHMENT_ID is the ID of this attachment."
         self._tool.bugs.add_patch_to_bug(