Changeset 53215 in webkit

Timestamp:

Jan 13, 2010 4:49:00 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-01-13 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

REGRESSION(53133): webkit-patch land dies if it can't find a bug id.
​https://bugs.webkit.org/show_bug.cgi?id=33634

Deal with the case of no bug patch object in the state.

• Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py:
• Scripts/webkitpy/steps/updatechangelogswithreviewer.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py (modified) (1 diff)
• Scripts/webkitpy/steps/updatechangelogswithreviewer.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-13  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(53133): webkit-patch land dies if it can't find a bug id.
+        https://bugs.webkit.org/show_bug.cgi?id=33634
+
+        Deal with the case of no bug patch object in the state.
+
+        * Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py:
+        * Scripts/webkitpy/steps/updatechangelogswithreviewer.py:
+
 2010-01-13  Kenneth Russell  <kbr@google.com>
 

trunk/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreview_unittests.py

@@ -30 +30 @@
 
 from webkitpy.steps.updatechangelogswithreviewer import UpdateChangeLogsWithReviewer
+from webkitpy.mock import Mock
 from webkitpy.mock_bugzillatool import MockBugzillaTool
 from webkitpy.outputcapture import OutputCapture
 
-class UpdateChangeLogsWithReviewerStepTest(unittest.TestCase):
+class UpdateChangeLogsWithReviewerTest(unittest.TestCase):
     def test_guess_reviewer_from_bug(self):
         capture = OutputCapture()
-        step = UpdateChangeLogsWithReviewer(MockBugzillaTool(), [])
+        step = UpdateChangeLogsWithReviewer(MockBugzillaTool(), Mock())
         expected_stderr = "0 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_empty_state(self):
+        capture = OutputCapture()
+        step = UpdateChangeLogsWithReviewer(MockBugzillaTool(), Mock())
+        capture.assert_outputs(self, step.run, [{}])

trunk/WebKitTools/Scripts/webkitpy/steps/updatechangelogswithreviewer.py

@@ -52 +52 @@
 
     def run(self, state):
-        bug_id = state.get("bug_id") or state["patch"].bug_id()
+        bug_id = state.get("bug_id")
+        if not bug_id and state.get("patch"):
+            bug_id = state.get("patch").bug_id()
 
         reviewer = self._options.reviewer