Changeset 52540 in webkit

Timestamp:

Dec 23, 2009 6:31:27 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-23 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

commit-queue should mention bug 30084 when rejecting patches until it can be fixed
​https://bugs.webkit.org/show_bug.cgi?id=32911

• Scripts/modules/bugzilla.py: Make the message even more fancy.
• Scripts/modules/bugzilla_unittest.py: Test our new fancy message.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/bugzilla.py (modified) (1 diff)
• Scripts/modules/bugzilla_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-23  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        commit-queue should mention bug 30084 when rejecting patches until it can be fixed
+        https://bugs.webkit.org/show_bug.cgi?id=32911
+
+        * Scripts/modules/bugzilla.py: Make the message even more fancy.
+        * Scripts/modules/bugzilla_unittest.py: Test our new fancy message.
+
 2009-12-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebKitTools/Scripts/modules/bugzilla.py

@@ -174 +174 @@
 
     def _flag_permission_rejection_message(self, setter_email, flag_name):
-        committer_list = "WebKitTools/Scripts/modules/committers.py"
-        contribution_guidlines_url = "http://webkit.org/coding/contributing.html"
+        committer_list = "WebKitTools/Scripts/modules/committers.py" # This could be computed from CommitterList.__file__
+        contribution_guidlines_url = "http://webkit.org/coding/contributing.html" # Should come from some webkit_config.py
+        queue_administrator = "eseidel@chromium.org" # This could be queried from the status_bot.
+        queue_name = "commit-queue" # This could be queried from the tool.
         rejection_message = "%s does not have %s permissions according to %s." % (setter_email, flag_name, self._view_source_link(committer_list))
-        rejection_message += "\n\n- If you have %s rights please correct the error in %s by adding yourself to the file (no review needed) and then set the %s flag again." % (flag_name, committer_list, flag_name)
         rejection_message += "\n\n- If you do not have %s rights please read %s for instructions on how to use bugzilla flags." % (flag_name, contribution_guidlines_url)
+        rejection_message += "\n\n- If you have %s rights please correct the error in %s by adding yourself to the file (no review needed)." % (flag_name, committer_list)
+        rejection_message += "  Due to bug 30084 the %s will require a restart after your change." % queue_name
+        rejection_message += "  Please contact %s to request a %s restart." % (queue_administrator, queue_name)
+        rejection_message += "  After restart the %s will correctly respect your %s rights." % (queue_name, flag_name)
         return rejection_message
 

trunk/WebKitTools/Scripts/modules/bugzilla_unittest.py

@@ -193 +193 @@
         OutputCapture().assert_outputs(self, bugzilla.add_cc_to_bug, [42, ["adam@example.com"]], expected_stderr=expected_stderr)
 
+    def test_flag_permission_rejection_message(self):
+        bugzilla = Bugzilla()
+        expected_messsage="""foo@foo.com does not have review permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/modules/committers.py.
+
+- If you do not have review rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.
+
+- If you have review rights please correct the error in WebKitTools/Scripts/modules/committers.py by adding yourself to the file (no review needed).  Due to bug 30084 the commit-queue will require a restart after your change.  Please contact eseidel@chromium.org to request a commit-queue restart.  After restart the commit-queue will correctly respect your review rights."""
+        self.assertEqual(bugzilla._flag_permission_rejection_message("foo@foo.com", "review"), expected_messsage)
+
 
 if __name__ == '__main__':