Changeset 107293 in webkit

Timestamp:

Feb 9, 2012 2:33:16 PM (12 years ago)

Author:

dpranke@chromium.org

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/steps/preparechangelog_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-09  Dirk Pranke  <dpranke@chromium.org>
+
+        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  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py

@@ -30 +30 @@
 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
@@ -36 +38 @@
 
 
-class PrepareChangeLogTest(ChangeLogTest):
+class PrepareChangeLogTest(changelog_unittest.ChangeLogTest):
     def test_ensure_bug_url(self):
         capture = OutputCapture()

trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert_unittest.py

@@ -32 +32 @@
 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 *
 
@@ -108 +110 @@
 
     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)