Changeset 143109 in webkit

Timestamp:

Feb 16, 2013 1:57:17 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

We need a CIA replacement
​https://bugs.webkit.org/show_bug.cgi?id=110008

Reviewed by Andreas Kling.

Added new-commit-bot.

• Scripts/webkitpy/tool/bot/queueengine.py:

(QueueEngine.init):
(QueueEngine): Made the sleep tiem configurable.
(QueueEngine._sleep_message):
(QueueEngine._sleep):

• Scripts/webkitpy/tool/bot/queueengine_unittest.py:

(QueueEngineTest.test_sleep_message):

• Scripts/webkitpy/tool/commands/init.py:
• Scripts/webkitpy/tool/commands/newcommitbot.py: Added.

(PingPong): Added. Implements the ping pong protocol.
(NewCommitBot):
(NewCommitBot.begin_work_queue):
(NewCommitBot.work_item_log_path):
(NewCommitBot.next_work_item): Update SVN revision and report any new commits made since
the last time we checked the head SVN revision.
(NewCommitBot.process_work_item):
(NewCommitBot._update_checkout): svn up.
(NewCommitBot._new_svn_revisions): Returns a range of new revisions.
(NewCommitBot._summarize_commit_log): Summarize a commit log to be posted on IRC.
(NewCommitBot.handle_unexpected_error):
(NewCommitBot.handle_script_error):

• Scripts/webkitpy/tool/commands/newcommitbot_unittest.py: Added.

(NewCommitBotTest.test_summarize_commit_log_basic): Tests for summarizing non-rollout commits.
(NewCommitBotTest.test_summarize_commit_log_rollout): Tests for summarizing rollouts.

• Scripts/webkitpy/tool/commands/queues.py:

(AbstractQueue.execute):

• Scripts/webkitpy/tool/commands/queuestest.py:

(MockQueueEngine.init):

• Scripts/webkitpy/tool/commands/sheriffbot_unittest.py:

(SheriffBotTest.test_command_aliases):

• Scripts/webkitpy/tool/main.py:

(WebKitPatch):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/queueengine.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/queueengine_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/__init__.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/newcommitbot.py (added)
• Scripts/webkitpy/tool/commands/newcommitbot_unittest.py (added)
• Scripts/webkitpy/tool/commands/queues.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queuestest.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/sheriffbot_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/main.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-02-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        We need a CIA replacement
+        https://bugs.webkit.org/show_bug.cgi?id=110008
+
+        Reviewed by Andreas Kling.
+
+        Added new-commit-bot.
+
+        * Scripts/webkitpy/tool/bot/queueengine.py:
+        (QueueEngine.__init__):
+        (QueueEngine): Made the sleep tiem configurable.
+        (QueueEngine._sleep_message):
+        (QueueEngine._sleep):
+        * Scripts/webkitpy/tool/bot/queueengine_unittest.py:
+        (QueueEngineTest.test_sleep_message):
+        * Scripts/webkitpy/tool/commands/__init__.py:
+        * Scripts/webkitpy/tool/commands/newcommitbot.py: Added.
+        (PingPong): Added. Implements the ping pong protocol.
+        (NewCommitBot):
+        (NewCommitBot.begin_work_queue):
+        (NewCommitBot.work_item_log_path):
+        (NewCommitBot.next_work_item): Update SVN revision and report any new commits made since
+        the last time we checked the head SVN revision.
+        (NewCommitBot.process_work_item):
+        (NewCommitBot._update_checkout): svn up.
+        (NewCommitBot._new_svn_revisions): Returns a range of new revisions.
+        (NewCommitBot._summarize_commit_log): Summarize a commit log to be posted on IRC.
+        (NewCommitBot.handle_unexpected_error):
+        (NewCommitBot.handle_script_error):
+        * Scripts/webkitpy/tool/commands/newcommitbot_unittest.py: Added.
+        (NewCommitBotTest.test_summarize_commit_log_basic): Tests for summarizing non-rollout commits.
+        (NewCommitBotTest.test_summarize_commit_log_rollout): Tests for summarizing rollouts.
+        * Scripts/webkitpy/tool/commands/queues.py:
+        (AbstractQueue.execute):
+        * Scripts/webkitpy/tool/commands/queuestest.py:
+        (MockQueueEngine.__init__):
+        * Scripts/webkitpy/tool/commands/sheriffbot_unittest.py:
+        (SheriffBotTest.test_command_aliases):
+        * Scripts/webkitpy/tool/main.py:
+        (WebKitPatch):
+
 2013-02-16  Jochen Eisinger  <jochen@chromium.org>
 

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

@@ -70 +70 @@
 
 class QueueEngine:
-    def __init__(self, name, delegate, wakeup_event):
+    def __init__(self, name, delegate, wakeup_event, seconds_to_sleep=120):
         self._name = name
         self._delegate = delegate
         self._wakeup_event = wakeup_event
         self._output_tee = OutputTee()
+        self._seconds_to_sleep = seconds_to_sleep
 
     log_date_format = "%Y-%m-%d %H:%M:%S"
-    sleep_duration_text = "2 mins"  # This could be generated from seconds_to_sleep
-    seconds_to_sleep = 120
     handled_error_code = 2
 
@@ -154 +153 @@
 
     def _sleep_message(self, message):
-        wake_time = self._now() + timedelta(seconds=self.seconds_to_sleep)
-        return "%s Sleeping until %s (%s)." % (message, wake_time.strftime(self.log_date_format), self.sleep_duration_text)
+        wake_time = self._now() + timedelta(seconds=self._seconds_to_sleep)
+        if self._seconds_to_sleep < 3 * 60:
+            sleep_duration_text = str(self._seconds_to_sleep) + ' seconds'
+        else:
+            sleep_duration_text = str(round(self._seconds_to_sleep / 60)) + ' minutes'
+        return "%s Sleeping until %s (%s)." % (message, wake_time.strftime(self.log_date_format), sleep_duration_text)
 
     def _sleep(self, message):
         _log.info(self._sleep_message(message))
-        self._wakeup_event.wait(self.seconds_to_sleep)
+        self._wakeup_event.wait(self._seconds_to_sleep)
         self._wakeup_event.clear()

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

@@ -174 +174 @@
         engine = QueueEngine("test", None, None)
         engine._now = lambda: datetime.datetime(2010, 1, 1)
-        expected_sleep_message = "MESSAGE Sleeping until 2010-01-01 00:02:00 (2 mins)."
+        expected_sleep_message = "MESSAGE Sleeping until 2010-01-01 00:02:00 (120 seconds)."
         self.assertEqual(engine._sleep_message("MESSAGE"), expected_sleep_message)
 

trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py

@@ -11 +11 @@
 from webkitpy.tool.commands.findusers import FindUsers
 from webkitpy.tool.commands.gardenomatic import GardenOMatic
+from webkitpy.tool.commands.newcommitbot import NewCommitBot
 from webkitpy.tool.commands.openbugs import OpenBugs
 from webkitpy.tool.commands.perfalizer import Perfalizer

trunk/Tools/Scripts/webkitpy/tool/commands/queues.py

@@ -149 +149 @@
         self._options = options # FIXME: This code is wrong.  Command.options is a list, this assumes an Options element!
         self._tool = tool  # FIXME: This code is wrong too!  Command.bind_to_tool handles this!
-        return engine(self.name, self, self._tool.wakeup_event).run()
+        return engine(self.name, self, self._tool.wakeup_event, self._options.seconds_to_sleep).run()
 
     @classmethod

trunk/Tools/Scripts/webkitpy/tool/commands/queuestest.py

@@ -38 +38 @@
 
 class MockQueueEngine(object):
-    def __init__(self, name, queue, wakeup_event):
+    def __init__(self, name, queue, wakeup_event, seconds_to_sleep):
         pass
 

trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot_unittest.py

@@ -38 +38 @@
         options = MockOptions()
         options.ensure_value("confirm", False)
+        options.ensure_value("seconds_to_sleep", 120)
         sheriffbot = SheriffBot()
         sheriffbot.execute(options, [], tool, MockQueueEngine)

trunk/Tools/Scripts/webkitpy/tool/main.py

@@ -49 +49 @@
         make_option("--bot-id", action="store", dest="bot_id", type="string", help="Identifier for this bot (if multiple bots are running for a queue)"),
         make_option("--irc-password", action="store", dest="irc_password", type="string", help="Password to use when communicating via IRC."),
+        make_option("--seconds-to-sleep", action="store", default=120, type="int", help="Number of seconds to sleep in the task queue."),
         make_option("--port", action="store", dest="port", default=None, help="Specify a port (e.g., mac, qt, gtk, ...)."),
     ]