[webkit-changes] [136875] trunk/Tools

Thu, 06 Dec 2012 13:08:12 -0800

Title: [136875] trunk/Tools
Revision
136875
Author
o...@chromium.org
Date
2012-12-06 13:09:58 -0800 (Thu, 06 Dec 2012)

Log Message

Allow for CCing a secondary email address from watchlists
https://bugs.webkit.org/show_bug.cgi?id=104286

Reviewed by Dirk Pranke.

Change my watchlist CC address so I can filter these separately from
when people explicitly CC me and update the watchlist parser to allow that.

* Scripts/webkitpy/common/config/committers.py:
* Scripts/webkitpy/common/config/watchlist:
* Scripts/webkitpy/common/watchlist/watchlistparser.py:
(WatchListParser._validate):
* Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py:
(WatchListParserTest.test_cc_rule_with_invalid_email):
(WatchListParserTest.test_cc_rule_with_secondary_email):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (136874 => 136875)


--- trunk/Tools/ChangeLog	2012-12-06 20:40:24 UTC (rev 136874)
+++ trunk/Tools/ChangeLog	2012-12-06 21:09:58 UTC (rev 136875)
@@ -1,3 +1,21 @@
+2012-12-06  Ojan Vafai  <o...@chromium.org>
+
+        Allow for CCing a secondary email address from watchlists
+        https://bugs.webkit.org/show_bug.cgi?id=104286
+
+        Reviewed by Dirk Pranke.
+
+        Change my watchlist CC address so I can filter these separately from
+        when people explicitly CC me and update the watchlist parser to allow that.
+
+        * Scripts/webkitpy/common/config/committers.py:
+        * Scripts/webkitpy/common/config/watchlist:
+        * Scripts/webkitpy/common/watchlist/watchlistparser.py:
+        (WatchListParser._validate):
+        * Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py:
+        (WatchListParserTest.test_cc_rule_with_invalid_email):
+        (WatchListParserTest.test_cc_rule_with_secondary_email):
+
 2012-12-06  Max Vujovic  <mvujo...@adobe.com>
 
         Unreviewed. Add myself to committers.py.

Modified: trunk/Tools/Scripts/webkitpy/common/config/committers.py (136874 => 136875)


--- trunk/Tools/Scripts/webkitpy/common/config/committers.py	2012-12-06 20:40:24 UTC (rev 136874)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers.py	2012-12-06 21:09:58 UTC (rev 136875)
@@ -535,7 +535,7 @@
     Reviewer("Nate Chapin", "jap...@chromium.org", ["japhet", "natechapin"]),
     Reviewer("Nikolas Zimmermann", ["zimmerm...@kde.org", "zimmerm...@physik.rwth-aachen.de", "zimmerm...@webkit.org", "nzimmerm...@rim.com"], "wildfox"),
     Reviewer("Noam Rosenthal", ["n...@webkit.org", "noam.rosent...@nokia.com"], "noamr"),
-    Reviewer("Ojan Vafai", "o...@chromium.org", "ojan"),
+    Reviewer("Ojan Vafai", ["o...@chromium.org", "ojan.aut...@gmail.com"], "ojan"),
     Reviewer("Oliver Hunt", "oli...@apple.com", "olliej"),
     Reviewer("Pavel Feldman", ["pfeld...@chromium.org", "pfeld...@google.com"], "pfeldman"),
     Reviewer("Philippe Normand", ["pnorm...@igalia.com", "ph...@webkit.org", "ph...@igalia.com"], ["philn-tp", "pnormand"]),

Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (136874 => 136875)


--- trunk/Tools/Scripts/webkitpy/common/config/watchlist	2012-12-06 20:40:24 UTC (rev 136874)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist	2012-12-06 21:09:58 UTC (rev 136875)
@@ -309,11 +309,11 @@
         "Cairo": [ "dominik.rottsc...@intel.com" ],
         "CMake": [ "rak...@webkit.org", "gyuyoung....@samsung.com" ],
         "CoordinatedGraphics" : [ "n...@webkit.org", "z...@webkit.org" ],
-        "CSS": [ "ale...@webkit.org", "macpher...@chromium.org", "cmarc...@webkit.org", "o...@chromium.org"],
+        "CSS": [ "ale...@webkit.org", "macpher...@chromium.org", "cmarc...@webkit.org", "ojan.aut...@gmail.com"],
         "ChromiumGraphics": [ "jam...@chromium.org", "cc-b...@chromium.org" ],
         "ChromiumPublicApi": [ "aba...@webkit.org", "dglaz...@chromium.org", "fi...@chromium.org", "jam...@chromium.org", "tkent+wk...@chromium.org" ],
         "ChromiumTestRunner": [ "joc...@chromium.org" ],
-        "DOM": [ "o...@chromium.org" ],
+        "DOM": [ "ojan.aut...@gmail.com" ],
         "DOMAttributes": [ "cmarc...@webkit.org", ],
         "EFL": [ "rak...@webkit.org", "gyuyoung....@samsung.com" ],
         "EFLWebKit2PlatformSpecific": [ "gyuyoung....@samsung.com", "rak...@webkit.org" ],
@@ -325,7 +325,7 @@
         "GStreamerGraphics": [ "ale...@webkit.org", "pnorm...@igalia.com", "g...@gnome.org", "mrobin...@webkit.org" ],
         "GtkWebKit2PublicAPI": [ "cgar...@igalia.com", "g...@gnome.org", "mrobin...@webkit.org" ],
         "Harfbuzz": [ "dominik.rottsc...@intel.com" ],
-        "HTML": [ "o...@chromium.org" ],
+        "HTML": [ "ojan.aut...@gmail.com" ],
         "Loader": [ "jap...@chromium.org" ],
         "MathML": [ "dbar...@mathscribe.com" ],
         "Media": [ "feature-media-revi...@chromium.org", "eric.carl...@apple.com" ],
@@ -337,7 +337,7 @@
         "QtGraphics" : [ "n...@webkit.org" ],
         "QtWebKit2PlatformSpecific": [ "ale...@webkit.org", "cmarc...@webkit.org", "abe...@webkit.org" ],
         "QtWebKit2PublicAPI": [ "ale...@webkit.org", "cmarc...@webkit.org", "abe...@webkit.org" ],
-        "Rendering": [ "e...@webkit.org", "o...@chromium.org" ],
+        "Rendering": [ "e...@webkit.org", "ojan.aut...@gmail.com" ],
         "SVG": ["schen...@chromium.org", "p...@google.com", "fmal...@chromium.org", "dominik.rottsc...@intel.com" ],
         "SVNScripts": [ "dba...@webkit.org" ],
         "ScrollingCoordinator": [ "ander...@apple.com", "jam...@chromium.org", "toniki...@webkit.org" ],
@@ -346,19 +346,19 @@
         "Selectors": [ "allan.jen...@digia.com" ],
         "SoupNetwork": [ "rak...@webkit.org", "g...@gnome.org", "mrobin...@webkit.org", "d...@gnome.org" ],
         "StyleChecker": [ "le...@chromium.org", ],
-        "TestFailures": [ "aba...@webkit.org", "dglaz...@chromium.org", "o...@chromium.org" ],
+        "TestFailures": [ "aba...@webkit.org", "dglaz...@chromium.org", "ojan.aut...@gmail.com" ],
         "TextureMapper" : [ "n...@webkit.org" ],
         "ThreadingFiles|ThreadingUsage": [ "levin+thread...@chromium.org", ],
         "TouchAdjustment" : [ "allan.jen...@digia.com" ],
         "V8Bindings|BindingsScripts": [ "aba...@webkit.org", "jap...@chromium.org", "hara...@chromium.org" ],
-        "WTF": [ "benja...@webkit.org", "o...@chromium.org"],
+        "WTF": [ "benja...@webkit.org", "ojan.aut...@gmail.com"],
         "WatchListScript": [ "levin+watchl...@chromium.org", ],
         "WebGL": [ "d...@apple.com" ],
-        "WebIDL": [ "aba...@webkit.org", "o...@chromium.org" ],
+        "WebIDL": [ "aba...@webkit.org", "ojan.aut...@gmail.com" ],
         "WebInspectorAPI": [ "timo...@apple.com", "joep...@webkit.org" ],
         "WebKitGTKTranslations": [ "g...@gnome.org", "mrobin...@webkit.org" ],
         "WebSocket": [ "yu...@chromium.org" ],
-        "XSS": [ "dba...@webkit.org", "o...@chromium.org" ],
+        "XSS": [ "dba...@webkit.org", "ojan.aut...@gmail.com" ],
         "webkitperl": [ "dba...@webkit.org" ],
         "webkitpy": [ "aba...@webkit.org", "dpra...@chromium.org" ],
     },

Modified: trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py (136874 => 136875)


--- trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py	2012-12-06 20:40:24 UTC (rev 136874)
+++ trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py	2012-12-06 21:09:58 UTC (rev 136875)
@@ -152,7 +152,7 @@
             # modifying a list while iterating through it leads to undefined behavior.
             intructions_copy = cc_rule.instructions()[:]
             for email in intructions_copy:
-                if not accounts.account_by_login(email):
+                if not accounts.account_by_email(email):
                     cc_rule.remove_instruction(email)
                     self._log_error("The email alias %s which is in the watchlist is not listed as a contributor in committers.py" % email)
                     continue

Modified: trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py (136874 => 136875)


--- trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py	2012-12-06 20:40:24 UTC (rev 136874)
+++ trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser_unittest.py	2012-12-06 21:09:58 UTC (rev 136875)
@@ -185,6 +185,23 @@
                                        expected_logs='The email alias levin+bad+em...@chromium.org which is'
                                        + ' in the watchlist is not listed as a contributor in committers.py\n')
 
+    def test_cc_rule_with_secondary_email(self):
+        # FIXME: We should provide a mock of CommitterList so that we can test this on fake data.
+        watch_list = (
+            '{'
+            '    "DEFINITIONS": {'
+            '        "WatchList1": {'
+            '            "filename": r".*\\MyFileName\\.cpp",'
+            '        },'
+            '     },'
+            '    "CC_RULES": {'
+            '        "WatchList1": ["ojan.aut...@gmail.com"],'
+            '     },'
+            '}')
+
+        OutputCapture().assert_outputs(self, self._watch_list_parser.parse, args=[watch_list],
+                                       expected_logs='')
+
     def test_empty_message_rule(self):
         watch_list = (
             '{'

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to