Merge lp:~gmb/zope.testing/argh-argh-argh into lp:~launchpad/zope.testing/3.9.4-fork

[Graham Binns]

Update our Python 2.7-compatible code so that it falls back to existing behaviour when run under 2.6. Also bump the patch number to avoid anyone with a stale bad version of p16 in their download-cache from getting knobbled.

This branch tweaks our Python 2.7 compatibility code so that it doesn't break the test suite under Python 2.6.

Previously, we allowed addSkip() to do its thing under Python 2.6. aside from calling up to its parent class. However, existing behaviour is to just call addSuccess() when skipping tests under 2.6, so we decided to preserve that behaviour.

[Benji York (benji)]

This branch looks good. I think you have a typo, shouldn't "2.6" be "2.7" in the below comment?

    # This test can go away once we're only using Python 2.6

review: Approve (code)

[Launchpad QA Bot (lpqabot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'setup.py'
--- setup.py	2012-06-29 13:43:07 +0000
+++ setup.py	2012-07-05 14:28:32 +0000
@@ -85,7 +85,7 @@
 
 setup(
     name='zope.testing',
-    version = '3.9.4-p16',
+    version = '3.9.4-p17',
     url='http://pypi.python.org/pypi/zope.testing',
     license='ZPL 2.1',
     description='Zope testing framework, including the testrunner script.',
 
=== modified file 'src/zope/testing/testrunner/runner.py'
--- src/zope/testing/testrunner/runner.py	2012-07-05 12:03:23 +0000
+++ src/zope/testing/testrunner/runner.py	2012-07-05 14:28:32 +0000
@@ -795,12 +795,14 @@
         self._start_time = time.time()
 
     def addSkip(self, test, reason):
-        if hasattr(unittest.TestResult, 'addSkip'):
+        if sys.version_info[:-3] < (2, 7):
             # Python 2.6's unittest.TestResult has no concept of
-            # skipping, so we only call up to the parent class if doing
-            # so won't cause an error.
+            # skipping, so we fall back to addSuccess() if we're running
+            # under Python < 2.7.
+            self.addSuccess(test)
+        else:
             unittest.TestResult.addSkip(self, test, reason)
-        self.options.output.test_skip(test, reason)
+            self.options.output.test_skip(test, reason)
 
     def addSuccess(self, test):
         t = max(time.time() - self._start_time, 0.0)
 
=== modified file 'src/zope/testing/testrunner/test_testresult.py'
--- src/zope/testing/testrunner/test_testresult.py	2012-07-05 12:03:23 +0000
+++ src/zope/testing/testrunner/test_testresult.py	2012-07-05 14:28:32 +0000
@@ -17,6 +17,7 @@
 __metaclass__ = type
 
 import sys
+import time
 import unittest
 from StringIO import StringIO
 
@@ -31,10 +32,14 @@
 
     def __init__(self):
         self.test_skip_called = False
+        self.test_success_called = False
 
     def test_skip(self, test, reason):
         self.test_skip_called = True
 
+    def test_success(self, test, t):
+        self.test_success_called = True
+
 
 class MockOptions:
 
@@ -81,24 +86,42 @@
             options, tests=[self.example_suite],
             layer_name="zope.testing.testrunner.test_testresult.TestLayer")
 
-    def test_addSkip_calls_test_skip_on_output(self):
+    def test_addSkip_calls_test_skip_on_output_in_python27(self):
         # TestResult.addSkip() calls the test_skip() method on whatever
         # it has as an output formatter.
+        # XXX 2012-07-05 gmb:
+        #     This test is only run under Python 2.7; skips don't exist
+        #     in Python 2.6.
+        if sys.version_info[:-3] < (2, 7):
+            return
         test = self.example_suite._tests[0]
         self.result.addSkip(test, "Testing")
         self.assertTrue(self.output.test_skip_called)
 
-    def test_addSkip_appends_skipped_test_to_skipped(self):
+    def test_addSkip_appends_skipped_test_to_skipped_in_python27(self):
         # TestResult.addSkip() appends the skipped test to the
         # TestResult's skipped attribute.
-        # This test is only run under Python 2.7; skips don't exist in
-        # Python 2.6.
+        # XXX 2012-07-05 gmb:
+        #     This test is only run under Python 2.7; skips don't exist
+        #     in Python 2.6.
         if sys.version_info[:-3] < (2, 7):
             return
         test = self.example_suite._tests[0]
         self.result.addSkip(test, "Testing")
         self.assertIn((test, "Testing"), self.result.skipped)
 
+    # XXX 2012-07-05 gmb:
+    #     This test can go away once we're only using Python 2.7.
+    def test_addSkip_calls_addSuccess_under_python26(self):
+        # When running under Python 2.6, addSkip() calls addSuccess(),
+        # since skips aren't supported under Python 2.6
+        if sys.version_info[:-3] > (2, 6):
+            self.skipTest("Test is Python 2.6-specific.")
+        test = self.example_suite._tests[0]
+        self.result._start_time = time.time()
+        self.result.addSkip(test, "Testing")
+        self.assertTrue(self.output.test_success_called)
+
 
 class TestOutputFormatters(unittest.TestCase):
     """Tests for the handling of test_skip by different output formatters."""