Title: [107293] trunk/Tools
- Revision
- 107293
- Author
- [email protected]
- Date
- 2012-02-09 14:33:16 -0800 (Thu, 09 Feb 2012)
Log Message
some tests in webkitpy are being run three times
https://bugs.webkit.org/show_bug.cgi?id=78283
Reviewed by Ryosuke Niwa.
It turns out that if you import a class derived from
unittest.TestCase as a base name (e.g., from ... import ChangeLogTest),
the unittest framework treats it as if the class was defined in
the file (as well in the original file). This led us to running
the tests in ChangeLogTest three times.
* Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
(PrepareChangeLogTest):
* Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py:
(_assert_message_for_revert_output):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (107292 => 107293)
--- trunk/Tools/ChangeLog 2012-02-09 22:19:28 UTC (rev 107292)
+++ trunk/Tools/ChangeLog 2012-02-09 22:33:16 UTC (rev 107293)
@@ -1,3 +1,21 @@
+2012-02-09 Dirk Pranke <[email protected]>
+
+ some tests in webkitpy are being run three times
+ https://bugs.webkit.org/show_bug.cgi?id=78283
+
+ Reviewed by Ryosuke Niwa.
+
+ It turns out that if you import a class derived from
+ unittest.TestCase as a base name (e.g., from ... import ChangeLogTest),
+ the unittest framework treats it as if the class was defined in
+ the file (as well in the original file). This led us to running
+ the tests in ChangeLogTest three times.
+
+ * Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
+ (PrepareChangeLogTest):
+ * Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py:
+ (_assert_message_for_revert_output):
+
2012-02-09 Adam Barth <[email protected]>
Remove extraneous line in previous patch. I forgot to remove this
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py (107292 => 107293)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2012-02-09 22:19:28 UTC (rev 107292)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2012-02-09 22:33:16 UTC (rev 107293)
@@ -29,13 +29,15 @@
import os
import unittest
-from webkitpy.common.checkout.changelog_unittest import ChangeLogTest
+# Do not import changelog_unittest.ChangeLogTest directly as that will cause it to be run again.
+from webkitpy.common.checkout import changelog_unittest
+
from webkitpy.common.system.outputcapture import OutputCapture
from webkitpy.tool.mocktool import MockOptions, MockTool
from webkitpy.tool.steps.preparechangelog import PrepareChangeLog
-class PrepareChangeLogTest(ChangeLogTest):
+class PrepareChangeLogTest(changelog_unittest.ChangeLogTest):
def test_ensure_bug_url(self):
capture = OutputCapture()
step = PrepareChangeLog(MockTool(), MockOptions())
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py (107292 => 107293)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py 2012-02-09 22:19:28 UTC (rev 107292)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py 2012-02-09 22:33:16 UTC (rev 107293)
@@ -31,8 +31,10 @@
import tempfile
import unittest
+# Do not import changelog_unittest.ChangeLogTest directly as that will cause it to be run again.
+from webkitpy.common.checkout import changelog_unittest
+
from webkitpy.common.checkout.changelog import ChangeLog
-from webkitpy.common.checkout.changelog_unittest import ChangeLogTest
from webkitpy.tool.steps.preparechangelogforrevert import *
@@ -107,7 +109,7 @@
"""
def _assert_message_for_revert_output(self, args, expected_entry):
- changelog_contents = u"%s\n%s" % (ChangeLogTest._new_entry_boilerplate, ChangeLogTest._example_changelog)
+ changelog_contents = u"%s\n%s" % (changelog_unittest.ChangeLogTest._new_entry_boilerplate, changelog_unittest.ChangeLogTest._example_changelog)
changelog_path = self._write_tmp_file_with_contents(changelog_contents.encode("utf-8"))
changelog = ChangeLog(changelog_path)
changelog.update_with_unreviewed_message(PrepareChangeLogForRevert._message_for_revert(*args))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
