Changeset 61515 in webkit

Timestamp:

Jun 20, 2010 3:51:14 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-20 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Adam Barth.

Sheriffbot: Should allow "r" in SVN_REVISION
​https://bugs.webkit.org/show_bug.cgi?id=40889

• Scripts/webkitpy/tool/bot/irc_command.py: remove a leading "r" from SVN_REVISION if it exists
• Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py: test an SVN_REVISION with a leading r.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/irc_command.py (modified) (1 diff)
• Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-20  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Sheriffbot: Should allow "r" in SVN_REVISION
+        https://bugs.webkit.org/show_bug.cgi?id=40889
+
+        * Scripts/webkitpy/tool/bot/irc_command.py: remove a leading "r" from SVN_REVISION if it exists
+        * Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py: test an SVN_REVISION with a leading r.
+
 2010-06-20  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/tool/bot/irc_command.py

@@ -58 +58 @@
             tool.irc().post("%s: Usage: SVN_REVISION REASON" % nick)
             return
-        svn_revision = args[0]
+        svn_revision = args[0].lstrip("r")
         rollout_reason = " ".join(args[1:])
         tool.irc().post("Preparing rollout for r%s..." % svn_revision)

trunk/WebKitTools/Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py

@@ -63 +63 @@
         OutputCapture().assert_outputs(self, run, args=["rollout 21654 This patch broke the world"], expected_stderr=expected_stderr)
 
+    def test_rollout_with_r_in_svn_revision(self):
+        expected_stderr = "MOCK: irc.post: Preparing rollout for r21654...\nMOCK: irc.post: mock_nick: Created rollout: http://example.com/36936\n"
+        OutputCapture().assert_outputs(self, run, args=["rollout r21654 This patch broke the world"], expected_stderr=expected_stderr)
+
     def test_rollout_bananas(self):
         expected_stderr = "MOCK: irc.post: mock_nick: Usage: SVN_REVISION REASON\n"