Rev 4786: Make --parallel=fork compatible with --subunit. in file:///home/vila/src/bzr/bugs/419776-subunit/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Nov 4 11:59:35 GMT 2009
At file:///home/vila/src/bzr/bugs/419776-subunit/
------------------------------------------------------------
revno: 4786
revision-id: v.ladeuil+lp at free.fr-20091104115935-0fw5swdj80pasnir
parent: robertc at robertcollins.net-20091101055216-yfyue9tskyprkd0t
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 419776-subunit
timestamp: Wed 2009-11-04 12:59:35 +0100
message:
Make --parallel=fork compatible with --subunit.
* bzrlib/tests/__init__.py:
(BzrAutoTimingTestResultDecorator): Defines our own specialized
decorator to address bug #419776 until subunit provides native
support.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-11-01 05:41:57 +0000
+++ b/NEWS 2009-11-04 11:59:35 +0000
@@ -39,6 +39,9 @@
* KnownFailure is now signalled to ``ExtendedTestResult`` using the same
method that Python 2.7 uses - ``addExpectedFailure``. (Robert Collins)
+* ``--parallel=fork`` is now compatible with --subunit.
+ (Robert Collins, Vincent Ladeuil, #419776)
+
* TestNotApplicable is now handled within the TestCase.run method rather
than being looked for within ``ExtendedTestResult.addError``. This
provides better handling with other ``TestResult`` objects, degrading to
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2009-11-01 05:52:16 +0000
+++ b/bzrlib/tests/__init__.py 2009-11-04 11:59:35 +0000
@@ -3250,10 +3250,6 @@
concurrency = osutils.local_concurrency()
result = []
from subunit import TestProtocolClient, ProtocolTestCase
- try:
- from subunit.test_results import AutoTimingTestResultDecorator
- except ImportError:
- AutoTimingTestResultDecorator = lambda x:x
class TestInOtherProcess(ProtocolTestCase):
# Should be in subunit, I think. RBC.
def __init__(self, stream, pid):
@@ -3282,7 +3278,7 @@
sys.stdin.close()
sys.stdin = None
stream = os.fdopen(c2pwrite, 'wb', 1)
- subunit_result = AutoTimingTestResultDecorator(
+ subunit_result = BzrAutoTimingTestResultDecorator(
TestProtocolClient(stream))
process_suite.run(subunit_result)
finally:
@@ -3412,6 +3408,22 @@
return value
+try:
+ from subunit.test_results import AutoTimingTestResultDecorator
+ # Expected failure should be seen as a success not a failure Once subunit
+ # provide native support for that, BZRTransformingResult and this class
+ # will become useless.
+ class BzrAutoTimingTestResultDecorator(AutoTimingTestResultDecorator):
+
+ def addExpectedFailure(self, test, err):
+ self._before_event()
+ return self._call_maybe("addExpectedFailure", self._degrade_skip,
+ test, err)
+except ImportError:
+ # Let's just define a no-op decorator
+ BzrAutoTimingTestResultDecorator = lambda x:x
+
+
class ProfileResult(ForwardingResult):
"""Generate profiling data for all activity between start and success.
@@ -4392,13 +4404,9 @@
# Only define SubUnitBzrRunner if subunit is available.
try:
from subunit import TestProtocolClient
- try:
- from subunit.test_results import AutoTimingTestResultDecorator
- except ImportError:
- AutoTimingTestResultDecorator = lambda x:x
class SubUnitBzrRunner(TextTestRunner):
def run(self, test):
- result = AutoTimingTestResultDecorator(
+ result = BzrAutoTimingTestResultDecorator(
TestProtocolClient(self.stream))
test.run(result)
return result
More information about the bazaar-commits
mailing list