diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py')
-rw-r--r-- | Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py b/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py index f96b7b6b5..7e1767023 100644 --- a/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py +++ b/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py @@ -26,7 +26,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import unittest +import unittest2 as unittest import random from webkitpy.common.system.outputcapture import OutputCapture @@ -88,8 +88,11 @@ class IRCBotTest(unittest.TestCase): 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, whois\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: 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) def test_restart(self): expected_logs = "MOCK: irc.post: Restarting...\n" @@ -103,14 +106,6 @@ class IRCBotTest(unittest.TestCase): expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n" OutputCapture().assert_outputs(self, run, args=["revert 21654 This patch broke the world"], expected_logs=expected_logs) - def test_roll_chromium_deps(self): - expected_logs = "MOCK: irc.post: mock_nick: Rolling Chromium DEPS to r21654\nMOCK: irc.post: mock_nick: Created DEPS roll: http://example.com/36936\n" - OutputCapture().assert_outputs(self, run, args=["roll-chromium-deps 21654"], expected_logs=expected_logs) - - def test_roll_chromium_deps_to_lkgr(self): - expected_logs = "MOCK: irc.post: mock_nick: Rolling Chromium DEPS to last-known good revision\nMOCK: irc.post: mock_nick: Created DEPS roll: http://example.com/36936\n" - OutputCapture().assert_outputs(self, run, args=["roll-chromium-deps"], expected_logs=expected_logs) - def test_multi_rollout(self): expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for http://trac.webkit.org/changeset/21654, http://trac.webkit.org/changeset/21655, and http://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n" OutputCapture().assert_outputs(self, run, args=["rollout 21654 21655 21656 This 21654 patch broke the world"], expected_logs=expected_logs) |