Title: [244705] trunk/Tools
Revision
244705
Author
[email protected]
Date
2019-04-26 13:47:29 -0700 (Fri, 26 Apr 2019)

Log Message

Update inactive reviewers' status to 'contributor'.

* Scripts/webkitpy/common/config/contributors.json: The change.

* Scripts/webkitpy/common/checkout/changelog_unittest.py:
* Scripts/webkitpy/common/checkout/checkout_mock.py:
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
* Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py:
* Scripts/webkitpy/tool/bot/irc_command_unittest.py:
* Scripts/webkitpy/tool/bot/ircbot_unittest.py:
* Scripts/webkitpy/tool/commands/queries_unittest.py:
* Scripts/webkitpy/tool/commands/upload_unittest.py:
Sadly, regression tests operate on a crazy mix of mock and live data for
contributors.json. It would be a substantial project to mock all code paths,
so changing the tests instead.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (244704 => 244705)


--- trunk/Tools/ChangeLog	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/ChangeLog	2019-04-26 20:47:29 UTC (rev 244705)
@@ -1,3 +1,21 @@
+2019-04-26  Alexey Proskuryakov  <[email protected]>
+
+        Update inactive reviewers' status to 'contributor'.
+
+        * Scripts/webkitpy/common/config/contributors.json: The change.
+
+        * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+        * Scripts/webkitpy/common/checkout/checkout_mock.py:
+        * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+        * Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py:
+        * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
+        * Scripts/webkitpy/tool/bot/ircbot_unittest.py:
+        * Scripts/webkitpy/tool/commands/queries_unittest.py:
+        * Scripts/webkitpy/tool/commands/upload_unittest.py:
+        Sadly, regression tests operate on a crazy mix of mock and live data for
+        contributors.json. It would be a substantial project to mock all code paths,
+        so changing the tests instead.
+
 2019-04-26  Eric Carlson  <[email protected]>
 
         Create AVFoundationSoftLink.{h,mm} to reduce duplicate code

Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -41,7 +41,7 @@
 
     _example_entry = u'''2009-08-17  Peter Kasting  <[email protected]>
 
-        Reviewed by Tor Arne Vestb\xf8.
+        Reviewed by Fr\u00e9d\u00e9ric Wang.
 
         https://bugs.webkit.org/show_bug.cgi?id=27323
         Only add Cygwin to the path when it isn't already there.  This avoids
@@ -56,7 +56,7 @@
     _rolled_over_footer = '== Rolled over to ChangeLog-2009-06-16 =='
 
     # More example text than we need.  Eventually we need to support parsing this all and write tests for the parsing.
-    _example_changelog = u"""2009-08-17  Tor Arne Vestb\xf8  <[email protected]>
+    _example_changelog = u"""2009-08-17  Fr\u00e9d\u00e9ric Wang  <[email protected]>
 
         <http://webkit.org/b/28393> check-webkit-style: add check for use of std::max()/std::min() instead of MAX()/MIN()
 
@@ -237,7 +237,7 @@
         changelog_file = StringIO(self._example_changelog)
         parsed_entries = list(ChangeLog.parse_entries_from_file(changelog_file))
         self.assertEqual(len(parsed_entries), 9)
-        self.assertEqual(parsed_entries[0].date_line(), u"2009-08-17  Tor Arne Vestb\xf8  <[email protected]>")
+        self.assertEqual(parsed_entries[0].date_line(), u"2009-08-17  Fr\u00e9d\u00e9ric Wang  <[email protected]>")
         self.assertEqual(parsed_entries[0].date(), "2009-08-17")
         self.assertEqual(parsed_entries[0].reviewer_text(), "David Levin")
         self.assertEqual(parsed_entries[0].is_touched_files_text_clean(), False)
@@ -579,14 +579,14 @@
         self.assertEqual(self._entry_with_reviewer(reviewer_line).has_valid_reviewer(), expected)
 
     def test_has_valid_reviewer(self):
-        self._assert_has_valid_reviewer("Reviewed by Eric Seidel.", True)
-        self._assert_has_valid_reviewer("Reviewed by Eric Seidel", True)  # Not picky about the '.'
-        self._assert_has_valid_reviewer("Reviewed by Eric.", False)
-        self._assert_has_valid_reviewer("Reviewed by Eric C Seidel.", False)
-        self._assert_has_valid_reviewer("Rubber-stamped by Eric.", False)
-        self._assert_has_valid_reviewer("Rubber-stamped by Eric Seidel.", True)
-        self._assert_has_valid_reviewer("Rubber stamped by Eric.", False)
-        self._assert_has_valid_reviewer("Rubber stamped by Eric Seidel.", True)
+        self._assert_has_valid_reviewer("Reviewed by Darin Adler.", True)
+        self._assert_has_valid_reviewer("Reviewed by Darin Adler", True)  # Not picky about the '.'
+        self._assert_has_valid_reviewer("Reviewed by Darin.", False)
+        self._assert_has_valid_reviewer("Reviewed by Darin B Adler.", False)
+        self._assert_has_valid_reviewer("Rubber-stamped by Darin.", False)
+        self._assert_has_valid_reviewer("Rubber-stamped by Darin Adler.", True)
+        self._assert_has_valid_reviewer("Rubber stamped by Darin.", False)
+        self._assert_has_valid_reviewer("Rubber stamped by Darin Adler.", True)
         self._assert_has_valid_reviewer("Unreviewed build fix.", True)
         self._assert_has_valid_reviewer("Reviewed by Gabor Rapcsanyi.", False)
         self._assert_has_valid_reviewer("Reviewed by Myles Maxfield", True)
@@ -641,7 +641,7 @@
         self.assertEqual(latest_entry.contents(), self._example_entry)
         self.assertEqual(latest_entry.author_name(), "Peter Kasting")
         self.assertEqual(latest_entry.author_email(), "[email protected]")
-        self.assertEqual(latest_entry.reviewer_text(), u"Tor Arne Vestb\xf8")
+        self.assertEqual(latest_entry.reviewer_text(), u"Fr\u00e9d\u00e9ric Wang")
         touched_files = ["DumpRenderTree/win/DumpRenderTree.vcproj", "DumpRenderTree/win/ImageDiff.vcproj", "DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj"]
         self.assertEqual(latest_entry.touched_files(), touched_files)
         self.assertEqual(latest_entry.touched_functions(), dict((f, []) for f in touched_files))

Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -42,7 +42,7 @@
 committer_list = CommitterList()
 
 mock_revisions = {
-    1: CommitInfo(852, "[email protected]", {
+    1: CommitInfo(852, "[email protected]", {
         "bug_id": 50000,
         "author_name": "Adam Barth",
         "author_email": "[email protected]",
@@ -55,7 +55,7 @@
         ],
         "bug_description": "Example description of bug 50000.",
     }),
-    963: CommitInfo(963, "[email protected]", {
+    963: CommitInfo(963, "[email protected]", {
         "bug_id": 50005,
         "author_name": "Carol Szabo",
         "author_email": "[email protected]",
@@ -68,7 +68,7 @@
         ],
         "bug_description": "Example description of bug 50005.",
     }),
-    987: CommitInfo(987, "[email protected]", {
+    987: CommitInfo(987, "[email protected]", {
         "bug_id": 50006,
         "author_name": "Adam Barth",
         "author_email": "[email protected]",

Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -45,7 +45,7 @@
 from webkitpy.thirdparty.mock import Mock
 
 
-_changelog1entry1 = u"""2010-03-25  Tor Arne Vestb\u00f8  <[email protected]>
+_changelog1entry1 = u"""2010-03-25  Fr\u00e9d\u00e9ric Wang  <[email protected]>
 
         Unreviewed build fix to un-break webkit-patch land.
 
@@ -64,11 +64,11 @@
         * Scripts/webkitpy/common/checkout/api.py:
 """
 _changelog1 = u"\n".join([_changelog1entry1, _changelog1entry2])
-_changelog2 = u"""2010-03-25  Tor Arne Vestb\u00f8  <[email protected]>
+_changelog2 = u"""2010-03-25  Fr\u00e9d\u00e9ric Wang  <[email protected]>
 
         Unreviewed build fix to un-break webkit-patch land.
 
-        Second part of this complicated change by me, Tor Arne Vestb\u00f8!
+        Second part of this complicated change by me, Fr\u00e9d\u00e9ric Wang!
 
         * Path/To/Complicated/File: Added.
 
@@ -161,7 +161,7 @@
             # Note that we use a real Executive here, not a MockExecutive, so we can test that we're
             # invoking commit-log-editor correctly.
             env = os.environ.copy()
-            env['CHANGE_LOG_EMAIL_ADDRESS'] = '[email protected]'
+            env['CHANGE_LOG_EMAIL_ADDRESS'] = '[email protected]'
             kwargs['env'] = env
             return executive.run_command(*args, **kwargs)
 
@@ -190,7 +190,7 @@
 
 LayoutTests:
 
-Second part of this complicated change by me, Tor Arne Vestb\u00f8!
+Second part of this complicated change by me, Fr\u00e9d\u00e9ric Wang!
 
 * Path/To/Complicated/File: Added.
 """
@@ -377,8 +377,8 @@
         commitinfo = checkout.commit_info_for_revision(4)
         self.assertEqual(commitinfo.bug_id(), 36629)
         self.assertEqual(commitinfo.bug_description(), "Unreviewed build fix to un-break webkit-patch land.")
-        self.assertEqual(commitinfo.author_name(), u"Tor Arne Vestb\u00f8")
-        self.assertEqual(commitinfo.author_email(), "[email protected]")
+        self.assertEqual(commitinfo.author_name(), u"Fr\u00e9d\u00e9ric Wang")
+        self.assertEqual(commitinfo.author_email(), "[email protected]")
         self.assertIsNone(commitinfo.reviewer_text())
         self.assertIsNone(commitinfo.reviewer())
         self.assertEqual(commitinfo.committer_email(), "[email protected]")
@@ -385,13 +385,13 @@
         self.assertIsNone(commitinfo.committer())
         self.assertEqual(commitinfo.to_json(), {
             'bug_id': 36629,
-            'author_email': '[email protected]',
+            'author_email': '[email protected]',
             'changed_files': [
                 'path/to/file',
                 'another/file',
             ],
             'reviewer_text': None,
-            'author_name': u'Tor Arne Vestb\xf8',
+            'author_name': u'Fr\u00e9d\u00e9ric Wang',
             'bug_description': 'Unreviewed build fix to un-break webkit-patch land.',
         })
 
@@ -438,7 +438,7 @@
         checkout.changelog_entries_for_revision = mock_changelog_entries_for_revision
         reviewers = checkout.suggested_reviewers(git_commit=None)
         reviewer_names = [reviewer.full_name for reviewer in reviewers]
-        self.assertEqual(reviewer_names, [u'Tor Arne Vestb\xf8'])
+        self.assertEqual(reviewer_names, [u'Fr\u00e9d\u00e9ric Wang'])
 
     def test_apply_patch(self):
         checkout = self._make_checkout()

Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2019-04-26 20:47:29 UTC (rev 244705)
@@ -43,7 +43,7 @@
       "nicks" : [
          "inferno-sec"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Ada Chan" : {
       "emails" : [
@@ -53,7 +53,7 @@
       "nicks" : [
          "chanada"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Adam Barth" : {
       "emails" : [
@@ -111,7 +111,7 @@
       "nicks" : [
          "aroben"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Adam Treat" : {
       "emails" : [
@@ -123,7 +123,7 @@
       "nicks" : [
          "manyoso"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Adele Peterson" : {
       "emails" : [
@@ -133,7 +133,7 @@
       "nicks" : [
          "adele"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Ademar de Souza Reis Jr" : {
       "emails" : [
@@ -190,7 +190,7 @@
       "nicks" : [
          "enne"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Aharon Lanin" : {
       "emails" : [
@@ -326,7 +326,7 @@
       "nicks" : [
          "apavlov"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Alexandre Elias" : {
       "emails" : [
@@ -346,7 +346,7 @@
       "nicks" : [
          "achicu"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Alexey Marinichev" : {
       "emails" : [
@@ -378,7 +378,7 @@
       "nicks" : [
          "darktears"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Ali Juma" : {
       "emails" : [
@@ -407,7 +407,7 @@
       "nicks" : [
          "aliu"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Alicia Boya Garcia" : {
       "emails" : [
@@ -431,7 +431,7 @@
       "nicks" : [
          "carewolf"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Alok Priyadarshi" : {
       "emails" : [
@@ -452,7 +452,7 @@
       "nicks" : [
          "alp"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Ami Fischman" : {
       "emails" : [
@@ -525,7 +525,7 @@
       "nicks" : [
          "abucur"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Andrei Popescu" : {
       "emails" : [
@@ -773,7 +773,7 @@
       "nicks" : [
          "ariya"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Arko Saha" : {
       "emails" : [
@@ -874,7 +874,7 @@
       "nicks" : [
          "bemjb"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Ben Murdoch" : {
       "emails" : [
@@ -1095,7 +1095,7 @@
       "nicks" : [
          "cmarcelo"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Caitlin Potter" : {
       "emails" : [
@@ -1132,7 +1132,7 @@
       "nicks" : [
          "clopez"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Carlos Eduardo Ramalho" : {
       "emails" : [
@@ -1186,7 +1186,7 @@
       "nicks" : [
          "cshu"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "ChangSeok Oh" : {
       "emails" : [
@@ -1232,7 +1232,7 @@
       "nicks" : [
          "cblu"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Chris Dumez" : {
       "aliases" : [
@@ -1288,7 +1288,7 @@
       "nicks" : [
          "cjerdonek"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Chris Marrin" : {
       "emails" : [
@@ -1297,7 +1297,7 @@
       "nicks" : [
          "cmarrin"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Chris Nardi" : {
       "emails" : [
@@ -1325,7 +1325,7 @@
       "nicks" : [
          "crogers"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Christian Biesinger" : {
       "emails" : [
@@ -1414,7 +1414,7 @@
       "nicks" : [
          "ossy"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Dan Bernstein" : {
       "aliases" : [
@@ -1501,7 +1501,7 @@
       "nicks" : [
          "fishd"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Dave Barton" : {
       "emails" : [
@@ -1571,7 +1571,7 @@
       "nicks" : [
          "harrison"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "David Hyatt" : {
       "aliases" : [
@@ -1585,7 +1585,7 @@
          "dhyatt",
          "hyatt"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "David Jonathan Ross" : {
       "emails" : [
@@ -1616,7 +1616,7 @@
       "nicks" : [
          "dave_levin"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "David Michael Barr" : {
       "emails" : [
@@ -1741,7 +1741,7 @@
       "nicks" : [
          "dglazkov"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Dinu Jacob" : {
       "emails" : [
@@ -1762,7 +1762,7 @@
       "nicks" : [
          "dpranke"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Dirk Schulze" : {
       "emails" : [
@@ -1802,7 +1802,7 @@
       "nicks" : [
          "dimich"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Dominic Cooney" : {
       "emails" : [
@@ -1854,7 +1854,7 @@
       "nicks" : [
          "gramps"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Don Olmstead" : {
       "emails" : [
@@ -1926,7 +1926,7 @@
       "nicks" : [
          "dumi"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "D\u00e1niel B\u00e1tyai" : {
       "emails" : [
@@ -1968,7 +1968,7 @@
       "nicks" : [
          "esprehn"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Emil A Eklund" : {
       "aliases" : [
@@ -1981,7 +1981,7 @@
       "nicks" : [
          "eae"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Emilio Cobos Alvarez" : {
       "emails" : [
@@ -2000,7 +2000,7 @@
       "nicks" : [
          "enrica"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Enrique Oca\u00f1a Gonz\u00e1lez" : {
       "emails" : [
@@ -2049,7 +2049,7 @@
       "nicks" : [
          "eseidel"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Eric Uhrhane" : {
       "emails" : [
@@ -2246,7 +2246,7 @@
       "nicks" : [
          "gbarra"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Gavin Peters" : {
       "emails" : [
@@ -2279,7 +2279,7 @@
          "[email protected]"
       ],
       "expertise" : "Core KHTML Contributor, The QtWebKit Port",
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Gergo Balogh" : {
       "emails" : [
@@ -2429,7 +2429,7 @@
       "nicks" : [
          "morrita"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Hans Muller" : {
       "emails" : [
@@ -2514,7 +2514,7 @@
       "nicks" : [
          "zecke"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Hugo Parente Lima" : {
       "emails" : [
@@ -2742,7 +2742,7 @@
       "nicks" : [
          "jamesr"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "James Simonsen" : {
       "emails" : [
@@ -2762,7 +2762,7 @@
       "nicks" : [
          "janm"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Janos Badics" : {
       "emails" : [
@@ -2902,7 +2902,7 @@
       "nicks" : [
          "jorlow"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Jessie Berlin" : {
       "emails" : [
@@ -2940,7 +2940,7 @@
       "nicks" : [
          "jianli"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Jiewen Tan" : {
       "emails" : [
@@ -2998,7 +2998,7 @@
       "nicks" : [
          "jturcotte"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Jochen Eisinger" : {
       "emails" : [
@@ -3008,7 +3008,7 @@
       "nicks" : [
          "jochen__"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Joe Thomas" : {
       "emails" : [
@@ -3092,7 +3092,7 @@
       "nicks" : [
          "sullivan"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "John Wilander" : {
       "emails" : [
@@ -3124,7 +3124,7 @@
       "nicks" : [
          "jhoneycutt"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Jon Lee" : {
       "emails" : [
@@ -3291,7 +3291,7 @@
       "nicks" : [
          "jchaffraix"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Jungshik Shin" : {
       "emails" : [
@@ -3314,7 +3314,7 @@
       "nicks" : [
          "justing"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Justin Michaud" : {
       "emails" : [
@@ -3439,7 +3439,7 @@
       "emails" : [
          "[email protected]"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kenichi Ishibashi" : {
       "emails" : [
@@ -3475,7 +3475,7 @@
          "kenneth",
          "kenne"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kenneth Russell" : {
       "aliases" : [
@@ -3490,7 +3490,7 @@
          "kbr_google",
          "kbrgg"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kent Hansen" : {
       "emails" : [
@@ -3511,7 +3511,7 @@
       "nicks" : [
          "tkent"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kentaro Hara" : {
       "emails" : [
@@ -3522,7 +3522,7 @@
       "nicks" : [
          "haraken"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kevin Decker" : {
       "emails" : [
@@ -3532,7 +3532,7 @@
       "nicks" : [
          "superkevin"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kevin McCullough" : {
       "emails" : [
@@ -3542,7 +3542,7 @@
       "nicks" : [
          "maculloch"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kevin Ollivier" : {
       "emails" : [
@@ -3553,7 +3553,7 @@
       "nicks" : [
          "kollivier"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Kihong Kwon" : {
       "emails" : [
@@ -3709,7 +3709,7 @@
       "nicks" : [
          "lars"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Laszlo Gombos" : {
       "emails" : [
@@ -3722,7 +3722,7 @@
       "nicks" : [
          "lgombos"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Laszlo Vidacs" : {
       "emails" : [
@@ -3785,7 +3785,7 @@
       "nicks" : [
          "leviw"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Li Yin" : {
       "emails" : [
@@ -3854,7 +3854,7 @@
       "nicks" : [
          "lca"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Luke Macpherson" : {
       "emails" : [
@@ -3954,7 +3954,7 @@
       "nicks" : [
          "mhahnenberg"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Mark Lam" : {
       "emails" : [
@@ -3983,7 +3983,7 @@
       "nicks" : [
          "bdash"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Martin Hock" : {
       "emails" : [
@@ -4013,7 +4013,7 @@
       "nicks" : [
          "mrobinson"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Mary Wu" : {
       "emails" : [
@@ -4260,7 +4260,7 @@
       "nicks" : [
          "mihaip"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Mihai Tica" : {
       "emails" : [
@@ -4280,7 +4280,7 @@
       "nicks" : [
          "mihnea"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Mike Belshe" : {
       "emails" : [
@@ -4439,7 +4439,7 @@
          "japhet",
          "natechapin"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Nayan Kumar K" : {
       "emails" : [
@@ -4470,7 +4470,7 @@
       "nicks" : [
          "thakis"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Nikita Vasilyev" : {
       "emails" : [
@@ -4498,7 +4498,7 @@
       "nicks" : [
          "wildfox"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Nils Barth" : {
       "emails" : [
@@ -4528,7 +4528,7 @@
       "nicks" : [
          "noamr"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Noel Gordon" : {
       "emails" : [
@@ -4550,7 +4550,7 @@
       "nicks" : [
          "ojan"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Oliver Hunt" : {
       "emails" : [
@@ -4560,7 +4560,7 @@
       "nicks" : [
          "olliej"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Pablo Flouret" : {
       "emails" : [
@@ -4607,7 +4607,7 @@
       "nicks" : [
          "pfeldman"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Pavel Podivilov" : {
       "emails" : [
@@ -4708,7 +4708,7 @@
       "nicks" : [
          "pdr"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Philippe Normand" : {
       "emails" : [
@@ -4760,7 +4760,7 @@
       "nicks" : [
          "psolanki"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Pravin D" : {
       "emails" : [
@@ -4893,7 +4893,7 @@
       "nicks" : [
          "rjw"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Ricky Mondello" : {
       "emails" : [
@@ -5200,7 +5200,7 @@
       "nicks" : [
          "hamaji"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Shinya Kawanaka" : {
       "emails" : [
@@ -5272,7 +5272,7 @@
       "nicks" : [
          "tronical"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Simon Pena" : {
       "emails" : [
@@ -5312,7 +5312,7 @@
       "nicks" : [
          "schenney"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Stephen White" : {
       "emails" : [
@@ -5322,7 +5322,7 @@
       "nicks" : [
          "senorblanco"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Steve Block" : {
       "emails" : [
@@ -5333,7 +5333,7 @@
       "nicks" : [
          "steveblock"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Steve Falkenburg" : {
       "emails" : [
@@ -5343,7 +5343,7 @@
       "nicks" : [
          "sfalken"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Steve Lacey" : {
       "emails" : [
@@ -5581,7 +5581,7 @@
       "emails" : [
          "[email protected]"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Tim Volodine" : {
       "emails" : [
@@ -5661,7 +5661,7 @@
       "nicks" : [
          "tony^work"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Tony Gentilcore" : {
       "emails" : [
@@ -5671,7 +5671,7 @@
       "nicks" : [
          "tonyg-cr"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Tor Arne Vestb\u00f8" : {
       "emails" : [
@@ -5683,7 +5683,7 @@
       "nicks" : [
          "torarne"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Trey Matteson" : {
       "emails" : [
@@ -5736,7 +5736,7 @@
       "emails" : [
          "[email protected]"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Victor Carbune" : {
       "emails" : [
@@ -5822,7 +5822,7 @@
       "nicks" : [
          "vsevik"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "W. James MacLean" : {
       "emails" : [
@@ -5986,7 +5986,7 @@
       "nicks" : [
          "yong"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Yongjun Zhang" : {
       "emails" : [
@@ -6049,7 +6049,7 @@
       "nicks" : [
          "yurys"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Yusuke Suzuki" : {
       "emails" : [
@@ -6071,7 +6071,7 @@
       "nicks" : [
          "yutak"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Yuzo Fujishima" : {
       "emails" : [
@@ -6090,7 +6090,7 @@
       "nicks" : [
          "zackr"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Zalan Bujtas" : {
       "emails" : [
@@ -6152,7 +6152,7 @@
       "nicks" : [
          "zherczeg"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Zoltan Horvath" : {
       "emails" : [
@@ -6165,7 +6165,7 @@
       "nicks" : [
          "zoltan"
       ],
-      "status" : "reviewer"
+      "status" : "contributor"
    },
    "Zsolt Borbely" : {
       "emails" : [

Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -73,7 +73,7 @@
     "reviewer_email": "[email protected]",
     "commit-queue": "+",
     "committer_email": "[email protected]",
-    "attacher_email": "[email protected]",
+    "attacher_email": "[email protected]",
 }
 
 
@@ -114,7 +114,7 @@
     "is_patch": True,
     "review": "+",
     "reviewer_email": "[email protected]",
-    "attacher_email": "[email protected]",
+    "attacher_email": "[email protected]",
 }
 
 

Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -46,19 +46,19 @@
                           whois.execute("tom", ["Adam", "Barth"], None, None))
         self.assertEqual("tom: Sorry, I don't know any contributors matching '[email protected]'.",
                           whois.execute("tom", ["[email protected]"], None, None))
-        self.assertEqual('tom: [email protected] is "Tony Gentilcore" <[email protected]> (:tonyg-cr) (r). Why do you ask?',
+        self.assertEqual('tom: [email protected] is "Tony Gentilcore" <[email protected]> (:tonyg-cr). Why do you ask?',
                           whois.execute("tom", ["[email protected]"], None, None))
-        self.assertEqual('tom: [email protected] is "Tony Gentilcore" <[email protected]> (:tonyg-cr) (r). Why do you ask?',
+        self.assertEqual('tom: [email protected] is "Tony Gentilcore" <[email protected]> (:tonyg-cr). Why do you ask?',
                           whois.execute("tom", ["[email protected]"], None, None))
         self.assertEqual('tom: rniwa is "Ryosuke Niwa" <[email protected]> (:rniwa) (r). Why do you ask?',
                           whois.execute("tom", ["rniwa"], None, None))
         self.assertEqual('tom: Xan Lopez is "Xan Lopez" <[email protected]> (:xan) (r). Why do you ask?',
                           whois.execute("tom", ["Xan", "Lopez"], None, None))
-        self.assertEqual(u'tom: Osztrogon\u00e1c is "Csaba Osztrogon\u00e1c" <[email protected]> (:ossy) (r). Why do you ask?',
+        self.assertEqual(u'tom: Osztrogon\u00e1c is "Csaba Osztrogon\u00e1c" <[email protected]> (:ossy). Why do you ask?',
                           whois.execute("tom", [u'Osztrogon\u00e1c'], None, None))
         self.assertEqual('tom: "Vicki Murley" <[email protected]> hasn\'t told me their nick. Boo hoo :-(',
                           whois.execute("tom", ["[email protected]"], None, None))
-        self.assertEqual('tom: I\'m not sure who you mean?  "Gavin Barraclough" <[email protected]> (:gbarra) (r) or "Gavin Peters" <[email protected]> (:gavinp) could be \'Gavin\'.',
+        self.assertEqual('tom: I\'m not sure who you mean?  "Gavin Barraclough" <[email protected]> (:gbarra) or "Gavin Peters" <[email protected]> (: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))

Modified: trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -95,23 +95,23 @@
         OutputCapture().assert_outputs(self, run, args=["restart"], expected_logs=expected_logs, expected_exception=TerminateQueue)
 
     def test_rollout(self):
-        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, ap, darin: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["rollout 21654 This patch broke the world"], expected_logs=expected_logs)
 
     def test_revert(self):
-        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, ap, darin: 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_multi_rollout(self):
-        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, ap, darin: 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)
 
     def test_rollout_with_r_in_svn_revision(self):
-        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...\nMOCK: irc.post: mock_nick, abarth, ap, darin: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["rollout r21654 This patch broke the world"], expected_logs=expected_logs)
 
     def test_multi_rollout_with_r_in_svn_revision(self):
-        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, darin, eseidel: Created rollout: http://example.com/36936\n"
+        expected_logs = "MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ...\nMOCK: irc.post: mock_nick, abarth, ap, darin: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["rollout r21654 21655 r21656 This r21654 patch broke the world"], expected_logs=expected_logs)
 
     def test_rollout_bananas(self):
@@ -128,7 +128,7 @@
     def test_rollout_invalidate_reason(self):
         # FIXME: I'm slightly confused as to why this doesn't return the USAGE message.
         expected_logs = """MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654 ...
-MOCK: irc.post: mock_nick, abarth, darin, eseidel: Failed to create rollout patch:
+MOCK: irc.post: mock_nick, abarth, ap, darin: Failed to create rollout patch:
 MOCK: irc.post: The rollout reason may not begin with - (\"-bad (Requested by mock_nick on #webkit).\").
 """
         OutputCapture().assert_outputs(self, run,
@@ -137,7 +137,7 @@
 
     def test_multi_rollout_invalidate_reason(self):
         expected_logs = """MOCK: irc.post: mock_nick: Preparing rollout for https://trac.webkit.org/changeset/21654, https://trac.webkit.org/changeset/21655, and https://trac.webkit.org/changeset/21656 ...
-MOCK: irc.post: mock_nick, abarth, darin, eseidel: Failed to create rollout patch:
+MOCK: irc.post: mock_nick, abarth, ap, darin: Failed to create rollout patch:
 MOCK: irc.post: The rollout reason may not begin with - (\"-bad (Requested by mock_nick on #webkit).\").
 """
         OutputCapture().assert_outputs(self, run,

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -75,7 +75,7 @@
 
     def test_patches_to_commit_queue(self):
         expected_stdout = "http://example.com/10003&action=""
-        expected_logs = "10000 already has cq=+\n10001 already has cq=+\n10004 committer = \"Eric Seidel\" <[email protected]>\n"
+        expected_logs = "10000 already has cq=+\n10001 already has cq=+\n10004 committer = \"Alexey Proskuryakov\" <[email protected]>\n"
         options = Mock()
         options.bugs = False
         self.assert_execute_outputs(PatchesToCommitQueue(), None, expected_stdout, expected_logs=expected_logs, options=options)

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py (244704 => 244705)


--- trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py	2019-04-26 19:58:41 UTC (rev 244704)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py	2019-04-26 20:47:29 UTC (rev 244705)
@@ -45,9 +45,9 @@
     def test_assign_to_committer(self):
         tool = MockTool()
         expected_logs = """Warning, attachment 10001 on bug 50000 has invalid committer ([email protected])
-MOCK reassign_bug: bug_id=50000, [email protected]
+MOCK reassign_bug: bug_id=50000, [email protected]
 -- Begin comment --
-Attachment 10001 was posted by a committer and has review+, assigning to Eric Seidel for commit.
+Attachment 10001 was posted by a committer and has review+, assigning to Alexey Proskuryakov for commit.
 -- End comment --
 Bug 50003 is already assigned to [email protected] (None).
 Bug 50002 has no non-obsolete patches, ignoring.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to