Changeset 90840 in webkit

Timestamp:

Jul 12, 2011 12:20:56 PM (13 years ago)

Author:

abarth@webkit.org

Message:

sheriffbot can't perform rollouts
​https://bugs.webkit.org/show_bug.cgi?id=64370

Reviewed by Eric Seidel.

Now that we're not updating the working copy before processing every
IRC message, the rollout command needs to update it manually.

• Scripts/webkitpy/tool/bot/irc_command.py:
• Scripts/webkitpy/tool/bot/irc_command_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/irc_command.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/irc_command_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-12  Adam Barth  <abarth@webkit.org>
+
+        sheriffbot can't perform rollouts
+        https://bugs.webkit.org/show_bug.cgi?id=64370
+
+        Reviewed by Eric Seidel.
+
+        Now that we're not updating the working copy before processing every
+        IRC message, the rollout command needs to update it manually.
+
+        * Scripts/webkitpy/tool/bot/irc_command.py:
+        * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
+
 2011-07-12  Adam Barth  <abarth@webkit.org>
 

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

@@ -101 +101 @@
         return ", ".join(target_nicks)
 
+    def _update_working_copy(self, tool):
+        tool.scm().ensure_clean_working_directory(force_clean=True)
+        tool.executive.run_and_throw_if_fail(tool.port().update_webkit_command(), quiet=True)
+
     def execute(self, nick, args, tool, sheriff):
         svn_revision_list, rollout_reason = self._parse_args(args)
@@ -107 +111 @@
             # return is equivalent to an irc().post(), but makes for easier unit testing.
             return "%s: Usage: SVN_REVISION [SVN_REVISIONS] REASON" % nick
+
+        self._update_working_copy(tool)
 
         # FIXME: IRCCommand should bind to a tool and have a self._tool like Command objects do.

trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py

@@ -31 +31 @@
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.tool.bot.irc_command import *
-from webkitpy.tool.mocktool import MockTool
+from webkitpy.tool.mocktool import MockTool, MockExecutive
 
 
@@ -77 +77 @@
         self.assertEquals("1234", roll._parse_args(["1234"]))
 
+    def test_rollout_updates_working_copy(self):
+        rollout = Rollout()
+        tool = MockTool()
+        tool.executive = MockExecutive(should_log=True)
+        expected_stderr = "MOCK run_and_throw_if_fail: ['mock-update-webkit']\n"
+        OutputCapture().assert_outputs(self, rollout._update_working_copy, [tool], expected_stderr=expected_stderr)
+
     def test_rollout(self):
         rollout = Rollout()