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

[Graham Binns]

Update the handling of addSkip() to take account of the fact that such functionality doesn't exist in Python 2.6.

This branch fixes skips when using Python 2.6.

[Graham Binns (gmb)]

Self-reviewing for the sake of speed.

review: Approve

=== modified file 'src/zope/testing/testrunner/runner.py'
--- src/zope/testing/testrunner/runner.py	2012-06-29 12:26:22 +0000
+++ src/zope/testing/testrunner/runner.py	2012-07-05 12:07:23 +0000
@@ -795,7 +795,11 @@
         self._start_time = time.time()
 
     def addSkip(self, test, reason):
-        unittest.TestResult.addSkip(self, test, reason)
+        if hasattr(unittest.TestResult, 'addSkip'):
+            # 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.
+            unittest.TestResult.addSkip(self, test, reason)
         self.options.output.test_skip(test, reason)
 
     def addSuccess(self, test):
 
=== modified file 'src/zope/testing/testrunner/test_testresult.py'
--- src/zope/testing/testrunner/test_testresult.py	2012-06-29 13:40:49 +0000
+++ src/zope/testing/testrunner/test_testresult.py	2012-07-05 12:07:23 +0000
@@ -16,6 +16,7 @@
 
 __metaclass__ = type
 
+import sys
 import unittest
 from StringIO import StringIO
 
@@ -90,6 +91,10 @@
     def test_addSkip_appends_skipped_test_to_skipped(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.
+        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)