Changeset 56151 in webkit

Timestamp:

Mar 17, 2010 10:37:24 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-03-17 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

create-rollout should actually fill out the description
​https://bugs.webkit.org/show_bug.cgi?id=36261

• Scripts/webkitpy/commands/download.py:

The % operator was applied to the wrong string.

• Scripts/webkitpy/commands/download_unittest.py:
• Scripts/webkitpy/commands/upload_unittest.py:
• Scripts/webkitpy/mock_bugzillatool.py:

Add support for seeing what we actually do with create_bug.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/commands/download.py (modified) (2 diffs)
• Scripts/webkitpy/commands/download_unittest.py (modified) (1 diff)
• Scripts/webkitpy/commands/upload_unittest.py (modified) (1 diff)
• Scripts/webkitpy/mock_bugzillatool.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-17  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        create-rollout should actually fill out the description
+        https://bugs.webkit.org/show_bug.cgi?id=36261
+
+        * Scripts/webkitpy/commands/download.py:
+            The % operator was applied to the wrong string.
+        * Scripts/webkitpy/commands/download_unittest.py:
+        * Scripts/webkitpy/commands/upload_unittest.py:
+        * Scripts/webkitpy/mock_bugzillatool.py:
+            Add support for seeing what we actually do with create_bug.
+
 2010-03-17  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebKitTools/Scripts/webkitpy/commands/download.py

@@ -302 +302 @@
         del state["bug_id"]
         state["bug_title"] = "REGRESSION(r%s): %s" % (state["revision"], state["reason"])
-        state["bug_description"] = "%s broke the build:\n%s"
+        state["bug_description"] = "%s broke the build:\n%s" % (view_source_url(state["revision"]), state["reason"])
         # FIXME: If we had more context here, we could link to other open bugs
         #        that mention the test that regressed.
@@ -314 +314 @@
 
 "Only you can prevent forest fires." -- Smokey the Bear
-""" % (state["reason"], view_source_url(state["revision"]))
+"""
         return state
 

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

@@ -122 +122 @@
 
     def test_create_rollout(self):
-        expected_stderr="Preparing rollout for bug 12345.\nUpdating working directory\nRunning prepare-ChangeLog\n"
+        expected_stderr="Preparing rollout for bug 12345.\nMOCK create_bug\nbug_title: REGRESSION(r852): Reason\nbug_description: http://trac.webkit.org/changeset/852 broke the build:\nReason\nUpdating working directory\nRunning prepare-ChangeLog\n"
         self.assert_execute_outputs(CreateRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
 

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

@@ -66 +66 @@
 
     def test_prepare(self):
-        self.assert_execute_outputs(Prepare(), [])
+        expected_stderr = "MOCK create_bug\nbug_title: Mock user response\nbug_description: Mock user response\n"
+        self.assert_execute_outputs(Prepare(), [], expected_stderr=expected_stderr)
 
     def test_upload(self):

trunk/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py

@@ -247 +247 @@
                                                             "foo@bar.com")])
 
+    def create_bug(self,
+                   bug_title,
+                   bug_description,
+                   component=None,
+                   patch_file_object=None,
+                   patch_description=None,
+                   cc=None,
+                   blocked=None,
+                   mark_for_review=False,
+                   mark_for_commit_queue=False):
+        log("MOCK create_bug")
+        log("bug_title: %s" % bug_title)
+        log("bug_description: %s" % bug_description)
+
     def fetch_bug(self, bug_id):
         return Bug(self.bug_cache.get(bug_id), self)