Diff
Modified: trunk/Tools/ChangeLog (94992 => 94993)
--- trunk/Tools/ChangeLog 2011-09-13 00:06:28 UTC (rev 94992)
+++ trunk/Tools/ChangeLog 2011-09-13 00:07:52 UTC (rev 94993)
@@ -1,5 +1,20 @@
2011-09-12 Eric Seidel <[email protected]>
+ sheriffbot whois is case sensitive
+ https://bugs.webkit.org/show_bug.cgi?id=67972
+
+ Reviewed by Adam Barth.
+
+ I also fixed a typo in the "More than 5 contributors" message
+ from my previous commit.
+
+ * Scripts/webkitpy/common/config/committers.py:
+ * Scripts/webkitpy/common/config/committers_unittest.py:
+ * Scripts/webkitpy/tool/bot/irc_command.py:
+ * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
+
+2011-09-12 Eric Seidel <[email protected]>
+
sheriffbot whois should be smarter
https://bugs.webkit.org/show_bug.cgi?id=67971
Modified: trunk/Tools/Scripts/webkitpy/common/config/committers.py (94992 => 94993)
--- trunk/Tools/Scripts/webkitpy/common/config/committers.py 2011-09-13 00:06:28 UTC (rev 94992)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers.py 2011-09-13 00:07:52 UTC (rev 94993)
@@ -51,13 +51,14 @@
def __str__(self):
return '"%s" <%s>' % (self.full_name, self.emails[0])
- def contains_string(self, string):
- if string in self.full_name:
+ def contains_string(self, search_string):
+ string = search_string.lower()
+ if string in self.full_name.lower():
return True
- if self.irc_nickname and string in self.irc_nickname:
+ if self.irc_nickname and string in self.irc_nickname.lower():
return True
for email in self.emails:
- if string in email:
+ if string in email.lower():
return True
return False
Modified: trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py (94992 => 94993)
--- trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2011-09-13 00:06:28 UTC (rev 94992)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2011-09-13 00:07:52 UTC (rev 94993)
@@ -30,7 +30,6 @@
from webkitpy.common.config.committers import CommitterList, Contributor, Committer, Reviewer
class CommittersTest(unittest.TestCase):
-
def test_committer_lookup(self):
committer = Committer('Test One', '[email protected]', 'one')
reviewer = Reviewer('Test Two', ['[email protected]', '[email protected]', '[email protected]'])
@@ -75,3 +74,7 @@
self.assertEqual(committer_list.contributors(), [contributor, committer, reviewer])
self.assertEqual(committer_list.committers(), [committer, reviewer])
self.assertEqual(committer_list.reviewers(), [reviewer])
+
+ self.assertEqual(committer_list.contributors_by_search_string('test'), [contributor, committer, reviewer])
+ self.assertEqual(committer_list.contributors_by_search_string('rad'), [reviewer])
+ self.assertEqual(committer_list.contributors_by_search_string('Two'), [reviewer])
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (94992 => 94993)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2011-09-13 00:06:28 UTC (rev 94992)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2011-09-13 00:07:52 UTC (rev 94993)
@@ -186,7 +186,7 @@
if not contributors:
return "%s: Sorry, I don't know any contributors matching '%s'." % (nick, search_string)
if len(contributors) > 5:
- return "More than 5 contributors match '%s', can you be more specific?"
+ return "%s: More than 5 contributors match '%s', could you be more specific?" % (nick, search_string)
if len(contributors) == 1:
contributor = contributors[0]
if not contributor.irc_nickname:
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py (94992 => 94993)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py 2011-09-13 00:06:28 UTC (rev 94992)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py 2011-09-13 00:07:52 UTC (rev 94993)
@@ -51,8 +51,10 @@
whois.execute("tom", ["[email protected]"], None, None))
self.assertEquals('tom: "Vicki Murley" <[email protected]> hasn\'t told me their nick. Boo hoo :-(',
whois.execute("tom", ["[email protected]"], None, None))
- self.assertEquals('tom: I\'m not sure who you mean? ericu, "Eric Carlson" <[email protected]>, or eseidel could be \'eric\'.',
- whois.execute("tom", ["eric"], None, None))
+ self.assertEquals('tom: I\'m not sure who you mean? eroman, ericu, "Eric Carlson" <[email protected]>, or eseidel could be \'Eric\'.',
+ whois.execute("tom", ["Eric"], None, None))
+ self.assertEquals('tom: More than 5 contributors match \'david\', could you be more specific?',
+ whois.execute("tom", ["david"], None, None))
def test_create_bug(self):
create_bug = CreateBug()
