[webkit-changes] [105801] trunk/Tools

Tue, 24 Jan 2012 13:38:50 -0800

Title: [105801] trunk/Tools
Revision
105801
Author
[email protected]
Date
2012-01-24 13:38:40 -0800 (Tue, 24 Jan 2012)

Log Message

Put a space between the trac link and ellipsis in sheriffbot rollout message so it linkifies better in some IRC clients
https://bugs.webkit.org/show_bug.cgi?id=76884

Patch by James Robinson <[email protected]> on 2012-01-24
Reviewed by Adam Barth.

* Scripts/webkitpy/tool/bot/irc_command.py:
(Rollout.execute):
* Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py:
(SheriffIRCBotTest.test_rollout):
(SheriffIRCBotTest.test_revert):
(SheriffIRCBotTest.test_multi_rollout):
(SheriffIRCBotTest.test_rollout_with_r_in_svn_revision):
(SheriffIRCBotTest.test_multi_rollout_with_r_in_svn_revision):
(SheriffIRCBotTest.test_rollout_invalidate_reason):
(test_multi_rollout_invalidate_reason):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (105800 => 105801)


--- trunk/Tools/ChangeLog	2012-01-24 21:32:39 UTC (rev 105800)
+++ trunk/Tools/ChangeLog	2012-01-24 21:38:40 UTC (rev 105801)
@@ -1,3 +1,21 @@
+2012-01-24  James Robinson  <[email protected]>
+
+        Put a space between the trac link and ellipsis in sheriffbot rollout message so it linkifies better in some IRC clients
+        https://bugs.webkit.org/show_bug.cgi?id=76884
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/tool/bot/irc_command.py:
+        (Rollout.execute):
+        * Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py:
+        (SheriffIRCBotTest.test_rollout):
+        (SheriffIRCBotTest.test_revert):
+        (SheriffIRCBotTest.test_multi_rollout):
+        (SheriffIRCBotTest.test_rollout_with_r_in_svn_revision):
+        (SheriffIRCBotTest.test_multi_rollout_with_r_in_svn_revision):
+        (SheriffIRCBotTest.test_rollout_invalidate_reason):
+        (test_multi_rollout_invalidate_reason):
+
 2012-01-24  Kentaro Hara  <[email protected]>
 
         The cpp parser of prepare-ChangeLog cannot detect a change in classes and namespaces

Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (105800 => 105801)


--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py	2012-01-24 21:32:39 UTC (rev 105800)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py	2012-01-24 21:38:40 UTC (rev 105801)
@@ -132,7 +132,7 @@
             return "%s: Usage: rollout SVN_REVISION [SVN_REVISIONS] REASON" % nick
 
         revision_urls_string = join_with_separators([urls.view_revision_url(revision) for revision in svn_revision_list])
-        tool.irc().post("%s: Preparing rollout for %s..." % (nick, revision_urls_string))
+        tool.irc().post("%s: Preparing rollout for %s ..." % (nick, revision_urls_string))
 
         self._update_working_copy(tool)

Modified: trunk/Tools/Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py (105800 => 105801)


--- trunk/Tools/Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py	2012-01-24 21:32:39 UTC (rev 105800)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py	2012-01-24 21:38:40 UTC (rev 105801)
@@ -94,11 +94,11 @@
         OutputCapture().assert_outputs(self, run, args=["restart"], expected_stderr=expected_stderr, expected_exception=TerminateQueue)
 
     def test_rollout(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["rollout 21654 This patch broke the world"], expected_stderr=expected_stderr)
 
     def test_revert(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["revert 21654 This patch broke the world"], expected_stderr=expected_stderr)
 
     def test_roll_chromium_deps(self):
@@ -110,15 +110,15 @@
         OutputCapture().assert_outputs(self, run, args=["roll-chromium-deps"], expected_stderr=expected_stderr)
 
     def test_multi_rollout(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["rollout 21654 21655 21656 This 21654 patch broke the world"], expected_stderr=expected_stderr)
 
     def test_rollout_with_r_in_svn_revision(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: 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_multi_rollout_with_r_in_svn_revision(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["rollout r21654 21655 r21656 This r21654 patch broke the world"], expected_stderr=expected_stderr)
 
     def test_rollout_bananas(self):
@@ -134,7 +134,7 @@
 
     def test_rollout_invalidate_reason(self):
         # FIXME: I'm slightly confused as to why this doesn't return the USAGE message.
-        expected_stderr = """MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654...
+        expected_stderr = """MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654 ...
 MOCK: irc.post: mock_nick, abarth, darin, eseidel: Failed to create rollout patch:
 MOCK: irc.post: The rollout reason may not begin with - (\"-bad (Requested by mock_nick on #webkit).\").
 """
@@ -143,7 +143,7 @@
                                        expected_stderr=expected_stderr)
 
     def test_multi_rollout_invalidate_reason(self):
-        expected_stderr = """MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656...
+        expected_stderr = """MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...
 MOCK: irc.post: mock_nick, abarth, darin, eseidel: Failed to create rollout patch:
 MOCK: irc.post: The rollout reason may not begin with - (\"-bad (Requested by mock_nick on #webkit).\").
 """

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to