Rev 4562: (robertc) Support timestamping subunit streams. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4562 [merge]
revision-id: pqm at pqm.ubuntu.com-20090723044626-jyq6o3zy6ru11v0f
parent: pqm at pqm.ubuntu.com-20090723012518-txkanz7di5glol2c
parent: robertc at robertcollins.net-20090722234651-4g295cre9i24cvlp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-07-23 05:46:26 +0100
message:
  (robertc) Support timestamping subunit streams. (Robert Collins)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'NEWS'
--- a/NEWS	2009-07-23 00:24:30 +0000
+++ b/NEWS	2009-07-23 04:46:26 +0000
@@ -116,6 +116,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-22 06:00:45 +0000
+++ b/bzrlib/tests/__init__.py	2009-07-23 04:46:26 +0000
@@ -2973,6 +2973,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):
@@ -3001,7 +3005,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)
@@ -3995,9 +4000,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: