Changeset 84455 in webkit

Timestamp:

Apr 20, 2011 7:20:17 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-20 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r84431.
​http://trac.webkit.org/changeset/84431
​https://bugs.webkit.org/show_bug.cgi?id=59061

Breaks for folks who don't have editbugs (Requested by abarth
on #webkit).

• Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
• Scripts/webkitpy/tool/commands/upload_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/steps/postdiff.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/bugzilla/bugzilla.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/upload_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/tool/mocktool.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/postdiff.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-20  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r84431.
+        http://trac.webkit.org/changeset/84431
+        https://bugs.webkit.org/show_bug.cgi?id=59061
+
+        Breaks for folks who don't have editbugs (Requested by abarth
+        on #webkit).
+
+        * Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+        * Scripts/webkitpy/tool/commands/upload_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/steps/postdiff.py:
+
 2011-04-20  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py

@@ -737 +737 @@
         self.browser.submit()
 
-    def reassign_bug(self, bug_id, assignee=None, comment_text=None):
-        self.authenticate()
-
-        if not assignee:
-            assignee = self.username
+    def reassign_bug(self, bug_id, assignee, comment_text=None):
+        self.authenticate()
 
         log("Assigning bug %s to %s" % (bug_id, assignee))

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

@@ -43 +43 @@
     def test_assign_to_committer(self):
         tool = MockTool()
-        expected_stderr = """Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)
-MOCK reassign_bug: bug_id=42, assignee=eric@webkit.org
--- Begin comment --
-Attachment 128 was posted by a committer and has review+, assigning to Eric Seidel for commit.
--- End comment --
-Bug 77 is already assigned to foo@foo.com (None).
-Bug 76 has no non-obsolete patches, ignoring.
-"""
+        expected_stderr = "Warning, attachment 128 on bug 42 has invalid committer (non-committer@example.com)\nBug 77 is already assigned to foo@foo.com (None).\nBug 76 has no non-obsolete patches, ignoring.\n"
         self.assert_execute_outputs(AssignToCommitter(), [], expected_stderr=expected_stderr, tool=tool)
+        tool.bugs.reassign_bug.assert_called_with(42, "eric@webkit.org", "Attachment 128 was posted by a committer and has review+, assigning to Eric Seidel for commit.")
 
     def test_obsolete_attachments(self):
@@ -69 +63 @@
 Was that diff correct?
 Obsoleting 2 old patches on bug 42
-MOCK reassign_bug: bug_id=42, assignee=None
 MOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
 MOCK: user.open_url: http://example.com/42
@@ -117 +110 @@
 Was that diff correct?
 Obsoleting 2 old patches on bug 42
-MOCK reassign_bug: bug_id=42, assignee=None
 MOCK add_patch_to_bug: bug_id=42, description=MOCK description, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False
 MOCK: user.open_url: http://example.com/42

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

@@ -330 +330 @@
         return "%s/%s%s" % (self.bug_server_url, attachment_id, action_param)
 
-    def reassign_bug(self, bug_id, assignee=None, comment_text=None):
-        log("MOCK reassign_bug: bug_id=%s, assignee=%s" % (bug_id, assignee))
-        if comment_text:
-            log("-- Begin comment --")
-            log(comment_text)
-            log("-- End comment --")
-
     def set_flag_on_attachment(self,
                                attachment_id,

trunk/Tools/Scripts/webkitpy/tool/steps/postdiff.py

@@ -46 +46 @@
         description = self._options.description or "Patch"
         comment_text = self._options.comment
-        bug_id = state["bug_id"]
-
-        # FIXME: We should find some way of caching the Bug object instead of
-        # going back to the network here.
-        if self._tool.bugs.fetch_bug(bug_id).is_unassigned():
-            self._tool.bugs.reassign_bug(bug_id)
-
-        self._tool.bugs.add_patch_to_bug(bug_id, diff, description, comment_text=comment_text, mark_for_review=self._options.review, mark_for_commit_queue=self._options.request_commit)
+        self._tool.bugs.add_patch_to_bug(state["bug_id"], diff, description, comment_text=comment_text, mark_for_review=self._options.review, mark_for_commit_queue=self._options.request_commit)
         if self._options.open_bug:
-            self._tool.user.open_url(self._tool.bugs.bug_url_for_bug_id(bug_id))
+            self._tool.user.open_url(self._tool.bugs.bug_url_for_bug_id(state["bug_id"]))