Diff
Modified: trunk/Tools/ChangeLog (150703 => 150704)
--- trunk/Tools/ChangeLog 2013-05-26 03:35:12 UTC (rev 150703)
+++ trunk/Tools/ChangeLog 2013-05-26 03:39:30 UTC (rev 150704)
@@ -1,5 +1,21 @@
2013-05-25 Ryosuke Niwa <rn...@webkit.org>
+ Some build fixes for WKR and webkitbot.
+
+ * Scripts/webkitpy/tool/bot/ircbot_unittest.py:
+ (IRCBotTest.test_help):
+ * Scripts/webkitpy/tool/commands/newcommitbot.py:
+ (Agent):
+ (Agent.__init__):
+ (Agent.name):
+ (NewCommitBot):
+ (NewCommitBot.begin_work_queue):
+ (NewCommitBot.next_work_item):
+ * Scripts/webkitpy/tool/commands/sheriffbot.py:
+ (SheriffBot):
+
+2013-05-25 Ryosuke Niwa <rn...@webkit.org>
+
Teach webkitbot and WKR how to respond to yt?
https://bugs.webkit.org/show_bug.cgi?id=116775
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py (150703 => 150704)
--- trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2013-05-26 03:35:12 UTC (rev 150703)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2013-05-26 03:39:30 UTC (rev 150704)
@@ -88,9 +88,9 @@
OutputCapture().assert_outputs(self, run, args=["hi"], expected_logs=expected_logs)
def test_help(self):
- expected_logs = 'MOCK: irc.post: mock_nick: Available commands: create-bug, help, hi, ping, restart, roll-chromium-deps, rollout, whois\nMOCK: irc.post: mock_nick: Type "mock-sheriff-bot: help COMMAND" for help on my individual commands.\n'
+ expected_logs = 'MOCK: irc.post: mock_nick: Available commands: create-bug, help, hi, ping, restart, roll-chromium-deps, rollout, whois, yt?\nMOCK: irc.post: mock_nick: Type "mock-sheriff-bot: help COMMAND" for help on my individual commands.\n'
OutputCapture().assert_outputs(self, run, args=["help"], expected_logs=expected_logs)
- expected_logs = 'MOCK: irc.post: mock_nick: Usage: hi\nMOCK: irc.post: mock_nick: Retrieves a random quip from Bugzilla.\nMOCK: irc.post: mock_nick: Aliases: hello\n'
+ expected_logs = 'MOCK: irc.post: mock_nick: Usage: hi\nMOCK: irc.post: mock_nick: Responds with hi.\nMOCK: irc.post: mock_nick: Aliases: hello\n'
OutputCapture().assert_outputs(self, run, args=["help hi"], expected_logs=expected_logs)
OutputCapture().assert_outputs(self, run, args=["help hello"], expected_logs=expected_logs)
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py (150703 => 150704)
--- trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py 2013-05-26 03:35:12 UTC (rev 150703)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/newcommitbot.py 2013-05-26 03:39:30 UTC (rev 150704)
@@ -45,8 +45,17 @@
_log = logging.getLogger(__name__)
+class Agent(object):
+ def __init__(self, tool, newcommitbot):
+ self._tool = tool
+ self._newcommitbot = newcommitbot
+
+ def name(self):
+ return 'WKR'
+
+
class NewCommitBot(AbstractQueue, StepSequenceErrorHandler):
- name = "new-commit-bot"
+ name = "WKR"
watchers = AbstractQueue.watchers + ["rn...@webkit.org"]
_commands = {
@@ -63,7 +72,7 @@
def begin_work_queue(self):
AbstractQueue.begin_work_queue(self)
self._last_svn_revision = int(self._tool.scm().head_svn_revision())
- self._irc_bot = IRCBot('WKR', self._tool, None, self._commands)
+ self._irc_bot = IRCBot(self.name, self._tool, Agent(self._tool, self), self._commands)
self._tool.ensure_irc_connected(self._irc_bot.irc_delegate())
def work_item_log_path(self, failure_map):
@@ -74,6 +83,7 @@
_log.info('Last SVN revision: %d' % self._last_svn_revision)
+ return
count = 0
while count < self._maximum_number_of_revisions_to_avoid_spamming_irc:
new_revision = self._last_svn_revision + 1
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py (150703 => 150704)
--- trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py 2013-05-26 03:35:12 UTC (rev 150703)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py 2013-05-26 03:39:30 UTC (rev 150704)
@@ -38,7 +38,7 @@
class SheriffBot(AbstractQueue, StepSequenceErrorHandler):
- name = "webkitbot"
+ name = "rniwabot"
watchers = AbstractQueue.watchers + [
"aba...@webkit.org",
"e...@webkit.org",
