Changeset 95257 in webkit

Timestamp:

Sep 15, 2011 7:03:20 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

UpdateChangeLogsWithReviewer should be able to determine reviewer of latest reviewed patch in a bug
​https://bugs.webkit.org/show_bug.cgi?id=68003

Patch by Tom Zakrajsek <​tomz@codeaurora.org> on 2011-09-15
Reviewed by Adam Barth.

• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py:
• Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (4 diffs)
• Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-15  Tom Zakrajsek  <tomz@codeaurora.org>
+
+        UpdateChangeLogsWithReviewer should be able to determine reviewer of latest reviewed patch in a bug
+        https://bugs.webkit.org/show_bug.cgi?id=68003
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py:
+        * Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py:
+
 2011-09-15  Tom Zakrajsek  <tomz@codeaurora.org>
 

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

@@ -74 +74 @@
     "is_patch": True,
     "review": "+",
-    "reviewer_email": "foo@bar.com",
+    "reviewer_email": "reviewer2@webkit.org",
     "commit-queue": "+",
     "committer_email": "non-committer@example.com",
@@ -248 +248 @@
 
 
-_mock_reviewer = Reviewer("Foo Bar", "foo@bar.com")
+_mock_reviewers = [Reviewer("Foo Bar", "foo@bar.com"),
+                   Reviewer("Reviewer2", "reviewer2@webkit.org")]
 
 
@@ -270 +271 @@
     def __init__(self):
         self.queries = MockBugzillaQueries(self)
-        self.committers = CommitterList(reviewers=[_mock_reviewer])
+        self.committers = CommitterList(reviewers=_mock_reviewers)
         self._override_patch = None
 
@@ -623 +624 @@
 
     def suggested_reviewers(self, git_commit, changed_files=None):
-        return [_mock_reviewer]
+        return [_mock_reviewers[0]]
 
 

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

@@ -37 +37 @@
         capture = OutputCapture()
         step = UpdateChangeLogsWithReviewer(MockTool(), MockOptions())
-        expected_stderr = "0 reviewed patches on bug 75, cannot infer reviewer.\n"
+        expected_stderr = "No reviewed patches on bug 75, cannot infer reviewer.\n"
         capture.assert_outputs(self, step._guess_reviewer_from_bug, [75], expected_stderr=expected_stderr)
+
+    def test_guess_reviewer_from_multipatch_bug(self):
+        capture = OutputCapture()
+        step = UpdateChangeLogsWithReviewer(MockTool(), MockOptions())
+        expected_stderr = "Guessing \"Reviewer2\" as reviewer from attachment 128 on bug 42.\n"
+        capture.assert_outputs(self, step._guess_reviewer_from_bug, [42], expected_stderr=expected_stderr)
 
     def test_empty_state(self):

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

@@ -45 +45 @@
     def _guess_reviewer_from_bug(self, bug_id):
         patches = self._tool.bugs.fetch_bug(bug_id).reviewed_patches()
-        if len(patches) != 1:
-            log("%s on bug %s, cannot infer reviewer." % (pluralize("reviewed patch", len(patches)), bug_id))
+        if not patches:
+            log("%s on bug %s, cannot infer reviewer." % ("No reviewed patches", bug_id))
             return None
-        patch = patches[0]
+        patch = patches[-1]
         log("Guessing \"%s\" as reviewer from attachment %s on bug %s." % (patch.reviewer().full_name, patch.id(), bug_id))
         return patch.reviewer().full_name