Rev 4558: Support timestamping subunit streams. in http://bazaar.launchpad.net/~lifeless/bzr/subunit-times

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/subunit-times

------------------------------------------------------------
revno: 4558
revision-id: robertc at robertcollins.net-20090722234651-4g295cre9i24cvlp
parent: pqm at pqm.ubuntu.com-20090722013642-hejy07x9ub06tioj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: subunit-times
timestamp: Thu 2009-07-23 09:46:51 +1000
message:
  Support timestamping subunit streams.
=== modified file 'NEWS'
--- a/NEWS	2009-07-22 01:36:42 +0000
+++ b/NEWS	2009-07-22 23:46:51 +0000
@@ -91,6 +91,9 @@
   prevent corrupt deltas from affecting consistency of data structures on
   disk. (Robert Collins)
 
+* --subunit support now adds timestamps if the subunit version supports
+  it. (Robert Collins)
+
 
 bzr 1.17 "So late it's brunch" 2009-07-20
 #########################################

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-07-20 04:22:47 +0000
+++ b/bzrlib/tests/__init__.py	2009-07-22 23:46:51 +0000
@@ -2959,6 +2959,10 @@
     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):
@@ -2987,7 +2991,8 @@
                 sys.stdin.close()
                 sys.stdin = None
                 stream = os.fdopen(c2pwrite, 'wb', 1)
-                subunit_result = TestProtocolClient(stream)
+                subunit_result = AutoTimingTestResultDecorator(
+                    TestProtocolClient(stream))
                 process_suite.run(subunit_result)
             finally:
                 os._exit(0)
@@ -3981,9 +3986,14 @@
 # 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 = TestProtocolClient(self.stream)
+            result = AutoTimingTestResultDecorator(
+                TestProtocolClient(self.stream))
             test.run(result)
             return result
 except ImportError: