Changeset 56883 in webkit

Timestamp:

Mar 31, 2010 6:13:28 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-31 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Add the ability to restart sheriffbot from IRC
​https://bugs.webkit.org/show_bug.cgi?id=36909

• Scripts/webkitpy/tool/bot/irc_command.py:
• Scripts/webkitpy/tool/bot/queueengine.py:
• Scripts/webkitpy/tool/bot/sheriffircbot.py:
• Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-31  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Add the ability to restart sheriffbot from IRC
+        https://bugs.webkit.org/show_bug.cgi?id=36909
+
+        * Scripts/webkitpy/tool/bot/irc_command.py:
+        * Scripts/webkitpy/tool/bot/queueengine.py:
+        * Scripts/webkitpy/tool/bot/sheriffircbot.py:
+        * Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py:
+
 2010-03-31  Adam Barth  <abarth@webkit.org>
 

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

@@ -28 +28 @@
 
 from webkitpy.common.checkout.changelog import view_source_url
+from webkitpy.tool.bot.queueengine import TerminateQueue
+
 
 # FIXME: Merge with Command?
@@ -40 +42 @@
 
 
+class Restart(IRCCommand):
+    def execute(self, args, tool):
+        tool.irc().post("Restarting...")
+        raise TerminateQueue()
+
+
 class Hi(IRCCommand):
     def execute(self, args, tool):

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

@@ -37 +37 @@
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.deprecated_logging import log, OutputTee
+
+
+class TerminateQueue(Exception):
+    pass
+
 
 class QueueEngineDelegate:
@@ -110 +115 @@
                     message = "Unexpected failure when landing patch!  Please file a bug against webkit-patch.\n%s" % e.message_with_output()
                     self._delegate.handle_unexpected_error(work_item, message)
+            except TerminateQueue, e:
+                log("\nTerminateQueue exception received.")
+                return 0
             except KeyboardInterrupt, e:
                 log("\nUser terminated queue.")

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

@@ -56 +56 @@
     commands = {
         "last-green-revision": irc_command.LastGreenRevision,
+        "restart": irc_command.Restart,
         "hi": irc_command.Hi,
     }

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

@@ -47 +47 @@
 
     def test_bogus(self):
-        expected_stderr = "MOCK: irc.post: Available commands: hi, last-green-revision\n"
+        expected_stderr = "MOCK: irc.post: Available commands: hi, restart, last-green-revision\n"
         OutputCapture().assert_outputs(self, run, args=["bogus"], expected_stderr=expected_stderr)