Diff
Modified: trunk/Tools/ChangeLog (148050 => 148051)
--- trunk/Tools/ChangeLog 2013-04-09 20:56:27 UTC (rev 148050)
+++ trunk/Tools/ChangeLog 2013-04-09 21:25:20 UTC (rev 148051)
@@ -1,3 +1,21 @@
+2013-04-09 Ryosuke Niwa <[email protected]>
+
+ webkitbot refers to sheriffbot in help
+ https://bugs.webkit.org/show_bug.cgi?id=114307
+
+ Reviewed by Benjamin Poulain.
+
+ Fixed the bug by proxying the IRC nickname of "sheriffbot" via Sheriff object.
+
+ * Scripts/webkitpy/tool/bot/irc_command.py:
+ (Help):
+ (Help.execute):
+ (RollChromiumDEPS.execute):
+ * Scripts/webkitpy/tool/bot/ircbot_unittest.py:
+ (IRCBotTest.test_help):
+ * Scripts/webkitpy/tool/bot/sheriff.py:
+ (Sheriff.name):
+
2013-04-06 Roger Fong <[email protected]>
Kill old processes between runs on WinEWS bots.
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (148050 => 148051)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-04-09 20:56:27 UTC (rev 148050)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-04-09 21:25:20 UTC (rev 148051)
@@ -90,7 +90,7 @@
class Help(IRCCommand):
usage_string = "help [COMMAND]"
- help_string = "Provides help on individual sheriffbot commands."
+ help_string = "Provides help on my individual commands."
def execute(self, nick, args, tool, sheriff):
if args:
@@ -99,7 +99,7 @@
self._post_command_help(nick, tool, commands[command_name])
else:
tool.irc().post("%s: Available commands: %s" % (nick, ", ".join(sorted(visible_commands.keys()))))
- tool.irc().post('%s: Type "sheriffbot: help COMMAND" for help on individual commands.' % nick)
+ tool.irc().post('%s: Type "%s: help COMMAND" for help on my individual commands.' % (nick, sheriff.name()))
def _post_command_help(self, nick, tool, command):
tool.irc().post(command.usage(nick))
@@ -153,7 +153,7 @@
roll_target = "r%s" % revision if revision.isdigit() else "last-known good revision"
tool.irc().post("%s: Rolling Chromium DEPS to %s" % (nick, roll_target))
- changelog_message = "Unreviewed. Rolled Chromium DEPS to %s. Requested by %s via sheriffbot.\n\n" % (roll_target, self._expand_irc_nickname(nick))
+ changelog_message = "Unreviewed. Rolled Chromium DEPS to %s. Requested by %s via %s.\n\n" % (roll_target, self._expand_irc_nickname(nick), sheriff.name())
try:
bug_id = sheriff.post_chromium_deps_roll(revision, roll_target, changelog_message)
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py (148050 => 148051)
--- trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2013-04-09 20:56:27 UTC (rev 148050)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2013-04-09 21:25:20 UTC (rev 148051)
@@ -88,7 +88,7 @@
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, restart, roll-chromium-deps, rollout, sheriffs, whois\nMOCK: irc.post: mock_nick: Type "sheriffbot: help COMMAND" for help on individual commands.\n'
+ expected_logs = 'MOCK: irc.post: mock_nick: Available commands: create-bug, help, hi, restart, roll-chromium-deps, rollout, sheriffs, whois\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'
OutputCapture().assert_outputs(self, run, args=["help hi"], expected_logs=expected_logs)
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/sheriff.py (148050 => 148051)
--- trunk/Tools/Scripts/webkitpy/tool/bot/sheriff.py 2013-04-09 20:56:27 UTC (rev 148050)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/sheriff.py 2013-04-09 21:25:20 UTC (rev 148051)
@@ -36,6 +36,9 @@
self._tool = tool
self._sheriffbot = sheriffbot
+ def name(self):
+ return self._sheriffbot.name
+
def responsible_nicknames_from_commit_info(self, commit_info):
nestedList = [party.irc_nicknames for party in commit_info.responsible_parties() if party.irc_nicknames]
return reduce(lambda list, childList: list + childList, nestedList)
