Diff
Modified: trunk/Tools/ChangeLog (95231 => 95232)
--- trunk/Tools/ChangeLog 2011-09-15 21:43:28 UTC (rev 95231)
+++ trunk/Tools/ChangeLog 2011-09-15 21:49:17 UTC (rev 95232)
@@ -1,5 +1,19 @@
2011-09-15 Eric Seidel <e...@webkit.org>
+ Unreviewed. Make contributor email look-up case-insensitive.
+
+ validate-committer-list was incorrectly reporting that "chang....@nokia.com"
+ was missing from committers.py due to case sensitivity.
+
+ This also includes a test expectations update to committers_unittest.py
+ after my previous change.
+
+ * Scripts/webkitpy/common/config/committers.py:
+ * Scripts/webkitpy/common/config/committers_unittest.py:
+ * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
+
+2011-09-15 Eric Seidel <e...@webkit.org>
+
Unreviewed. Updated this based on webkit-patch suggest-nominations and validate-committer-list output.
Add a bunch of email aliases to committers.py for regular contributors
Modified: trunk/Tools/Scripts/webkitpy/common/config/committers.py (95231 => 95232)
--- trunk/Tools/Scripts/webkitpy/common/config/committers.py 2011-09-15 21:43:28 UTC (rev 95231)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers.py 2011-09-15 21:49:17 UTC (rev 95232)
@@ -38,6 +38,7 @@
self.emails = [email_or_emails]
else:
self.emails = email_or_emails
+ self.emails = map(lambda email: email.lower(), self.emails) # Emails are case-insensitive.
if isinstance(irc_nickname_or_nicknames, str):
self.irc_nicknames = [irc_nickname_or_nicknames]
else:
@@ -62,7 +63,7 @@
if string in nickname.lower():
return True
for email in self.emails:
- if string in email.lower():
+ if string in email:
return True
return False
@@ -474,7 +475,7 @@
return filter(lambda contributor: contributor.contains_string(string), self.contributors())
def contributor_by_email(self, email):
- return self._email_to_contributor_map().get(email)
+ return self._email_to_contributor_map().get(email.lower())
def committer_by_email(self, email):
return self._committer_only(self.contributor_by_email(email))
Modified: trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py (95231 => 95232)
--- trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2011-09-15 21:43:28 UTC (rev 95231)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2011-09-15 21:49:17 UTC (rev 95232)
@@ -32,8 +32,8 @@
class CommittersTest(unittest.TestCase):
def test_committer_lookup(self):
committer = Committer('Test One', 'o...@test.com', 'one')
- reviewer = Reviewer('Test Two', ['t...@test.com', 't...@rad.com', 'so_...@gmail.com'])
- contributor = Contributor('Test Three', ['th...@test.com'], 'three')
+ reviewer = Reviewer('Test Two', ['t...@test.com', 't...@rad.com', 'so_...@gmail.com'])
+ contributor = Contributor('Test Three', ['th...@test.com'], 'three')
contributor_with_two_nicknames = Contributor('Other Four', ['otherf...@webkit.org'], ['four', 'otherfour'])
committer_list = CommitterList(committers=[committer], reviewers=[reviewer], contributors=[contributor, contributor_with_two_nicknames])
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py (95231 => 95232)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py 2011-09-15 21:43:28 UTC (rev 95231)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py 2011-09-15 21:49:17 UTC (rev 95232)
@@ -53,7 +53,7 @@
whois.execute("tom", ["to...@chromium.org"], None, None))
self.assertEquals("tom: rniwa is rniwa (rn...@webkit.org). Why do you ask?",
whois.execute("tom", ["rniwa"], None, None))
- self.assertEquals("tom: lopez is xan (xan.lo...@gmail.com, x...@gnome.org, x...@webkit.org). Why do you ask?",
+ self.assertEquals("tom: lopez is xan (xan.lo...@gmail.com, x...@gnome.org, x...@webkit.org, xlo...@igalia.com). Why do you ask?",
whois.execute("tom", ["lopez"], None, None))
self.assertEquals('tom: "Vicki Murley" <vi...@apple.com> hasn\'t told me their nick. Boo hoo :-(',
whois.execute("tom", ["vi...@apple.com"], None, None))
