Rev 4781: Make addUnsupported more compatible with other TestResults. in http://bazaar.launchpad.net/~lifeless/bzr/subunit
Robert Collins
robertc at robertcollins.net
Sun Nov 1 03:49:12 GMT 2009
At http://bazaar.launchpad.net/~lifeless/bzr/subunit
------------------------------------------------------------
revno: 4781
revision-id: robertc at robertcollins.net-20091101034901-wbrzytpaadzq75q6
parent: pqm at pqm.ubuntu.com-20091031042050-avqp46clpe9fabzm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: subunit
timestamp: Sun 2009-11-01 14:49:01 +1100
message:
Make addUnsupported more compatible with other TestResults.
=== modified file 'NEWS'
--- a/NEWS 2009-10-30 16:13:05 +0000
+++ b/NEWS 2009-11-01 03:49:01 +0000
@@ -36,6 +36,16 @@
Testing
*******
+* UnavailableFeature is now handled within the TestCase.run method rather
+ than being looked for within addError. If the Result object does not
+ have an addNotSupported method, addSkip is attempted instead, and
+ failing that addSuccess. (Robert Collins)
+
+* When a TestResult does not have an addSkip method, skipped tests are now
+ reported as successful tests, rather than as errors. This change is
+ to make it possible to get a clean test run with a less capable
+ TestResult. (Robert Collins)
+
bzr 2.0.3 (not released yet)
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2009-10-29 21:13:16 +0000
+++ b/bzrlib/tests/__init__.py 2009-11-01 03:49:01 +0000
@@ -301,8 +301,6 @@
self._testConcluded(test)
if isinstance(err[1], TestNotApplicable):
return self._addNotApplicable(test, err)
- elif isinstance(err[1], UnavailableFeature):
- return self.addNotSupported(test, err[1].args[0])
else:
self._post_mortem()
unittest.TestResult.addError(self, test, err)
@@ -362,11 +360,11 @@
"""The test will not be run because of a missing feature.
"""
# this can be called in two different ways: it may be that the
- # test started running, and then raised (through addError)
+ # test started running, and then raised (through requireFeature)
# UnavailableFeature. Alternatively this method can be called
- # while probing for features before running the tests; in that
- # case we will see startTest and stopTest, but the test will never
- # actually run.
+ # while probing for features before running the test code proper; in
+ # that case we will see startTest and stopTest, but the test will
+ # never actually run.
self.unsupported.setdefault(str(feature), 0)
self.unsupported[str(feature)] += 1
self.report_unsupported(test, feature)
@@ -713,6 +711,8 @@
class UnavailableFeature(Exception):
"""A feature required for this test was not available.
+ This can be considered a specialised form of SkippedTest.
+
The feature should be used to construct the exception.
"""
@@ -1595,84 +1595,93 @@
def _do_skip(self, result, reason):
addSkip = getattr(result, 'addSkip', None)
if not callable(addSkip):
- result.addError(self, sys.exc_info())
+ result.addSuccess(result)
else:
addSkip(self, reason)
+ def _do_unsupported_or_skip(self, result, reason):
+ addNotSupported = getattr(result, 'addNotSupported', None)
+ if addNotSupported is not None:
+ result.addNotSupported(self, reason)
+ else:
+ self._do_skip(result, reason)
+
def run(self, result=None):
if result is None: result = self.defaultTestResult()
+ result.startTest(self)
+ try:
+ self._run(result)
+ return result
+ finally:
+ result.stopTest(self)
+
+ def _run(self, result):
for feature in getattr(self, '_test_needs_features', []):
if not feature.available():
- result.startTest(self)
- if getattr(result, 'addNotSupported', None):
- result.addNotSupported(self, feature)
- else:
- result.addSuccess(self)
- result.stopTest(self)
- return result
+ return self._do_unsupported_or_skip(result, feature)
try:
+ absent_attr = object()
+ # Python 2.5
+ method_name = getattr(self, '_testMethodName', absent_attr)
+ if method_name is absent_attr:
+ # Python 2.4
+ method_name = getattr(self, '_TestCase__testMethodName')
+ testMethod = getattr(self, method_name)
try:
- result.startTest(self)
- absent_attr = object()
- # Python 2.5
- method_name = getattr(self, '_testMethodName', absent_attr)
- if method_name is absent_attr:
- # Python 2.4
- method_name = getattr(self, '_TestCase__testMethodName')
- testMethod = getattr(self, method_name)
- try:
- try:
- self.setUp()
- if not self._bzr_test_setUp_run:
- self.fail(
- "test setUp did not invoke "
- "bzrlib.tests.TestCase's setUp")
- except KeyboardInterrupt:
- self._runCleanups()
- raise
- except TestSkipped, e:
- self._do_skip(result, e.args[0])
- self.tearDown()
- return result
- except:
- result.addError(self, sys.exc_info())
- self._runCleanups()
- return result
-
+ try:
+ self.setUp()
+ if not self._bzr_test_setUp_run:
+ self.fail(
+ "test setUp did not invoke "
+ "bzrlib.tests.TestCase's setUp")
+ except KeyboardInterrupt:
+ self._runCleanups()
+ raise
+ except TestSkipped, e:
+ self._do_skip(result, e.args[0])
+ self.tearDown()
+ return result
+ except UnavailableFeature, e:
+ result.addNotSupported(self, e.args[0])
+ except:
+ result.addError(self, sys.exc_info())
+ self._runCleanups()
+ return result
+
+ ok = False
+ try:
+ testMethod()
+ ok = True
+ except self.failureException:
+ result.addFailure(self, sys.exc_info())
+ except TestSkipped, e:
+ if not e.args:
+ reason = "No reason given."
+ else:
+ reason = e.args[0]
+ self._do_skip(result, reason)
+ except UnavailableFeature, e:
+ result.addNotSupported(self, e.args[0])
+ except KeyboardInterrupt:
+ self._runCleanups()
+ raise
+ except:
+ result.addError(self, sys.exc_info())
+
+ try:
+ self.tearDown()
+ if not self._bzr_test_tearDown_run:
+ self.fail(
+ "test tearDown did not invoke "
+ "bzrlib.tests.TestCase's tearDown")
+ except KeyboardInterrupt:
+ self._runCleanups()
+ raise
+ except:
+ result.addError(self, sys.exc_info())
+ self._runCleanups()
ok = False
- try:
- testMethod()
- ok = True
- except self.failureException:
- result.addFailure(self, sys.exc_info())
- except TestSkipped, e:
- if not e.args:
- reason = "No reason given."
- else:
- reason = e.args[0]
- self._do_skip(result, reason)
- except KeyboardInterrupt:
- self._runCleanups()
- raise
- except:
- result.addError(self, sys.exc_info())
-
- try:
- self.tearDown()
- if not self._bzr_test_tearDown_run:
- self.fail(
- "test tearDown did not invoke "
- "bzrlib.tests.TestCase's tearDown")
- except KeyboardInterrupt:
- self._runCleanups()
- raise
- except:
- result.addError(self, sys.exc_info())
- self._runCleanups()
- ok = False
- if ok: result.addSuccess(self)
- finally:
- result.stopTest(self)
+ if ok: result.addSuccess(self)
return result
except TestNotApplicable:
# Not moved from the result [yet].
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2009-10-29 21:13:16 +0000
+++ b/bzrlib/tests/test_selftest.py 2009-11-01 03:49:01 +0000
@@ -926,9 +926,10 @@
self._call = test, feature
result = InstrumentedTestResult(None, None, None, None)
feature = tests.Feature()
- def test_function():
- raise tests.UnavailableFeature(feature)
- test = unittest.FunctionTestCase(test_function)
+ class Test(tests.TestCase):
+ def test_function(self):
+ raise tests.UnavailableFeature(feature)
+ test = Test("test_function")
test.run(result)
# it should invoke 'addNotSupported'.
self.assertEqual(2, len(result._call))
More information about the bazaar-commits
mailing list