Changeset 94036 in webkit

Timestamp:

Aug 29, 2011, 6:43:57 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

sheriffbot "usage" help statements are wrong
​https://bugs.webkit.org/show_bug.cgi?id=67170

Patch by Tom Zakrajsek <​tomz@codeaurora.org> on 2011-08-29
Reviewed by Adam Barth.

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-29  Tom Zakrajsek  <tomz@codeaurora.org>
+
+        sheriffbot "usage" help statements are wrong
+        https://bugs.webkit.org/show_bug.cgi?id=67170
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/tool/bot/irc_command.py:
+        * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
+        * Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py:
+
 2011-08-29  Adam Barth  <abarth@webkit.org>
 

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

@@ -110 +110 @@
         if (not svn_revision_list or not rollout_reason):
             # return is equivalent to an irc().post(), but makes for easier unit testing.
-            return "%s: Usage: SVN_REVISION [SVN_REVISIONS] REASON" % nick
+            return "%s: Usage: rollout SVN_REVISION [SVN_REVISIONS] REASON" % nick
 
         self._update_working_copy(tool)
@@ -175 +175 @@
     def execute(self, nick, args, tool, sheriff):
         if len(args) != 1:
-            return "%s: Usage: BUGZILLA_EMAIL" % nick
+            return "%s: Usage: whois BUGZILLA_EMAIL" % nick
         email = args[0]
         # FIXME: We should get the ContributorList off the tool somewhere.
@@ -201 +201 @@
     def execute(self, nick, args, tool, sheriff):
         if not args:
-            return "%s: Usage: BUG_TITLE" % nick
+            return "%s: Usage: create-bug BUG_TITLE" % nick
 
         bug_title = " ".join(args)

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

@@ -42 +42 @@
     def test_whois(self):
         whois = Whois()
-        self.assertEquals("tom: Usage: BUGZILLA_EMAIL",
+        self.assertEquals("tom: Usage: whois BUGZILLA_EMAIL",
                           whois.execute("tom", [], None, None))
-        self.assertEquals("tom: Usage: BUGZILLA_EMAIL",
+        self.assertEquals("tom: Usage: whois BUGZILLA_EMAIL",
                           whois.execute("tom", ["Adam", "Barth"], None, None))
         self.assertEquals("tom: Sorry, I don't know unknown@example.com. Maybe you could introduce me?",
@@ -55 +55 @@
     def test_create_bug(self):
         create_bug = CreateBug()
-        self.assertEquals("tom: Usage: BUG_TITLE",
+        self.assertEquals("tom: Usage: create-bug BUG_TITLE",
                           create_bug.execute("tom", [], None, None))
 
@@ -94 +94 @@
 
         # Invalid arguments result in the USAGE message.
-        self.assertEquals("tom: Usage: SVN_REVISION [SVN_REVISIONS] REASON",
+        self.assertEquals("tom: Usage: rollout SVN_REVISION [SVN_REVISIONS] REASON",
                           rollout.execute("tom", [], None, None))
 

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

@@ -119 +119 @@
 
     def test_rollout_bananas(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Usage: SVN_REVISION [SVN_REVISIONS] REASON\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Usage: rollout SVN_REVISION [SVN_REVISIONS] REASON\n"
         OutputCapture().assert_outputs(self, run, args=["rollout bananas"], expected_stderr=expected_stderr)
 
     def test_rollout_invalidate_revision(self):
         # When folks pass junk arguments, we should just spit the usage back at them.
-        expected_stderr = "MOCK: irc.post: mock_nick: Usage: SVN_REVISION [SVN_REVISIONS] REASON\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Usage: rollout SVN_REVISION [SVN_REVISIONS] REASON\n"
         OutputCapture().assert_outputs(self, run,
                                        args=["rollout --component=Tools 21654"],
@@ -150 +150 @@
 
     def test_rollout_no_reason(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Usage: SVN_REVISION [SVN_REVISIONS] REASON\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Usage: rollout SVN_REVISION [SVN_REVISIONS] REASON\n"
         OutputCapture().assert_outputs(self, run, args=["rollout 21654"], expected_stderr=expected_stderr)
 
     def test_multi_rollout_no_reason(self):
-        expected_stderr = "MOCK: irc.post: mock_nick: Usage: SVN_REVISION [SVN_REVISIONS] REASON\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Usage: rollout SVN_REVISION [SVN_REVISIONS] REASON\n"
         OutputCapture().assert_outputs(self, run, args=["rollout 21654 21655 r21656"], expected_stderr=expected_stderr)