Modified: trunk/Tools/ChangeLog (105081 => 105082)
--- trunk/Tools/ChangeLog 2012-01-16 20:01:52 UTC (rev 105081)
+++ trunk/Tools/ChangeLog 2012-01-16 20:02:51 UTC (rev 105082)
@@ -1,3 +1,14 @@
+2012-01-16 Csaba Osztrogonác <[email protected]>
+
+ REGRESSION(r105072): It broke committers_unittest.py
+ https://bugs.webkit.org/show_bug.cgi?id=76396
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/common/config/committers_unittest.py:
+ (CommittersTest._assert_fuzz_match): It should handle more names.
+ (CommittersTest.test_contributors_by_fuzzy_match_with_legacy_names): Fix the testcase.
+
2012-01-16 Mario Sanchez Prada <[email protected]>
[GTK] Include gtk+3 in the jhbuild modules
Modified: trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py (105081 => 105082)
--- trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2012-01-16 20:01:52 UTC (rev 105081)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2012-01-16 20:02:51 UTC (rev 105082)
@@ -104,7 +104,10 @@
def _assert_fuzz_match(self, text, name_of_expected_contributor, expected_distance):
committers = CommitterList()
contributors, distance = committers.contributors_by_fuzzy_match(text)
- expected_names = [name_of_expected_contributor] if name_of_expected_contributor else []
+ if type(name_of_expected_contributor) is list:
+ expected_names = name_of_expected_contributor
+ else:
+ expected_names = [name_of_expected_contributor] if name_of_expected_contributor else []
self.assertEqual(([contributor.full_name for contributor in contributors], distance), (expected_names, expected_distance))
def test_contributors_by_fuzzy_match(self):
@@ -167,7 +170,7 @@
# self._assert_fuzz_match('Chris', 'Chris Blumenberg', 0)
self._assert_fuzz_match('cblu', 'Chris Blumenberg', 0)
- self._assert_fuzz_match('Dan', 'Dan Bernstein', 0)
+ self._assert_fuzz_match('Dan', ['Dan Winship', 'Dan Bernstein'], 0)
self._assert_fuzz_match('Dan B', 'Dan Bernstein', 0)
# self._assert_fuzz_match('mitz', 'Dan Bernstein', 0)
self._assert_fuzz_match('Mitz Pettel', 'Dan Bernstein', 1)
