REGRESSSION (r243297): webkitpy tests broken
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2019 20:39:59 +0000 (20:39 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2019 20:39:59 +0000 (20:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=196108

Reviewed by Aakash Jain.

r243297 updated contributors.json, which broke a few unit tests.

* Scripts/webkitpy/tool/bot/irc_command_unittest.py:
(IRCCommandTest.test_whois):
* Scripts/webkitpy/tool/commands/suggestnominations_unittest.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py
Tools/Scripts/webkitpy/tool/commands/suggestnominations_unittest.py

index 5201c77..ed96858 100644 (file)
@@ -1,3 +1,16 @@
+2019-03-21  Jonathan Bedard  <jbedard@apple.com>
+
+        REGRESSSION (r243297): webkitpy tests broken
+        https://bugs.webkit.org/show_bug.cgi?id=196108
+
+        Reviewed by Aakash Jain.
+
+        r243297 updated contributors.json, which broke a few unit tests.
+
+        * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
+        (IRCCommandTest.test_whois):
+        * Scripts/webkitpy/tool/commands/suggestnominations_unittest.py:
+
 2019-03-21  Chris Dumez  <cdumez@apple.com>
 
         WebKit should throw when trying to create a WKWebView with a related view that is using a different data store
index 2310d4a..f9c09ee 100644 (file)
@@ -58,7 +58,7 @@ class IRCCommandTest(unittest.TestCase):
                           whois.execute("tom", [u'Osztrogon\u00e1c'], None, None))
         self.assertEqual('tom: "Vicki Murley" <vicki@apple.com> hasn\'t told me their nick. Boo hoo :-(',
                           whois.execute("tom", ["vicki@apple.com"], None, None))
-        self.assertEqual('tom: I\'m not sure who you mean?  "Gavin Barraclough" <barraclough@apple.com> (:gbarra) (r) or "Gavin Peters" <gavinp@chromium.org> (:gavinp) (c) could be \'Gavin\'.',
+        self.assertEqual('tom: I\'m not sure who you mean?  "Gavin Barraclough" <barraclough@apple.com> (:gbarra) (r) or "Gavin Peters" <gavinp@chromium.org> (:gavinp) could be \'Gavin\'.',
                           whois.execute("tom", ["Gavin"], None, None))
         self.assertEqual('tom: More than 5 contributors match \'david\', could you be more specific?',
                           whois.execute("tom", ["david"], None, None))
index 36a420a..13bfc8d 100644 (file)
@@ -95,7 +95,7 @@ git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95188 268f45cc-cd09-04
 """
 
     def test_basic(self):
-        expected_stdout = "REVIEWER: Xianzhu Wang (wangxianzhu@chromium.org) has 88 reviewed patches\n"
+        expected_stdout = "COMMITTER: Xianzhu Wang (wangxianzhu@chromium.org) has 88 reviewed patches\n"
         options = self._make_options()
         suggest_nominations = SuggestNominations()
         suggest_nominations._init_options(options=options)
@@ -103,7 +103,7 @@ git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95188 268f45cc-cd09-04
         self.assert_execute_outputs(suggest_nominations, [], expected_stdout=expected_stdout, options=options)
 
     def test_with_verbose(self):
-        expected_stdout = "REVIEWER: Xianzhu Wang (wangxianzhu@chromium.org) has 88 reviewed patches\nCONTRIBUTOR: Xianzhu Wang (wangxianzhu@chromium.org) has 88 reviewed patches\n"
+        expected_stdout = "COMMITTER: Xianzhu Wang (wangxianzhu@chromium.org) has 88 reviewed patches\nCONTRIBUTOR: Xianzhu Wang (wangxianzhu@chromium.org) has 88 reviewed patches\n"
         options = self._make_options(verbose=True)
         suggest_nominations = SuggestNominations()
         suggest_nominations._init_options(options=options)