Title: [97094] trunk/Tools
- Revision
- 97094
- Author
- le...@chromium.org
- Date
- 2011-10-10 15:02:35 -0700 (Mon, 10 Oct 2011)
Log Message
Quick fix for watchlist unit test failures when using Python 2.7+
Reviewed by Adam Barth.
Filed bug https://bugs.webkit.org/show_bug.cgi?id=69789 about a
better fix.
* Scripts/webkitpy/common/webkitunittest.py: Always use our
version of assertRaisesRegexp.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (97093 => 97094)
--- trunk/Tools/ChangeLog 2011-10-10 22:01:38 UTC (rev 97093)
+++ trunk/Tools/ChangeLog 2011-10-10 22:02:35 UTC (rev 97094)
@@ -1,3 +1,14 @@
+2011-10-10 David Levin <le...@chromium.org>
+
+ Quick fix for watchlist unit test failures when using Python 2.7+
+ Reviewed by Adam Barth.
+
+ Filed bug https://bugs.webkit.org/show_bug.cgi?id=69789 about a
+ better fix.
+
+ * Scripts/webkitpy/common/webkitunittest.py: Always use our
+ version of assertRaisesRegexp.
+
2011-10-10 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r97082.
Modified: trunk/Tools/Scripts/webkitpy/common/webkitunittest.py (97093 => 97094)
--- trunk/Tools/Scripts/webkitpy/common/webkitunittest.py 2011-10-10 22:01:38 UTC (rev 97093)
+++ trunk/Tools/Scripts/webkitpy/common/webkitunittest.py 2011-10-10 22:02:35 UTC (rev 97094)
@@ -34,9 +34,8 @@
class TestCase(unittest.TestCase):
def setUp(self):
- # For versions of Python before 2.7.
- if not 'assertRaisesRegexp' in dir(self):
- self.assertRaisesRegexp = self._assertRaisesRegexp
+ # FIXME: Only do this for versions of Python before 2.7.
+ self.assertRaisesRegexp = self._assertRaisesRegexp
def _assertRaisesRegexp(self, regex_message, callable, *args):
try:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
