Changeset 94993 in webkit

Timestamp:

Sep 12, 2011 5:07:52 PM (13 years ago)

Author:

eric@webkit.org

Message:

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/committers.py (modified) (1 diff)
• Scripts/webkitpy/common/config/committers_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/irc_command.py (modified) (1 diff)
• Scripts/webkitpy/tool/bot/irc_command_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-12  Eric Seidel  <eric@webkit.org>
+
+        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  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/config/committers.py

@@ -52 +52 @@
         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

trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py

@@ -31 +31 @@
 
 class CommittersTest(unittest.TestCase):
-
     def test_committer_lookup(self):
         committer = Committer('Test One', 'one@test.com', 'one')
@@ -76 +75 @@
         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])

trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py

@@ -187 +187 @@
             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]

trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py

@@ -52 +52 @@
         self.assertEquals('tom: "Vicki Murley" <vicki@apple.com> hasn\'t told me their nick. Boo hoo :-(',
                           whois.execute("tom", ["vicki@apple.com"], None, None))
-        self.assertEquals('tom: I\'m not sure who you mean?  ericu, "Eric Carlson" <eric.carlson@apple.com>, 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" <eric.carlson@apple.com>, 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):