Rev 4814: Appropriately guard the import of AutoTimingTestResultDecorator from subunit. in http://people.canonical.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 4814
revision-id: robertc at robertcollins.net-20091222235313-glrqgjra210hq2qm
parent: robertc at robertcollins.net-20091222234722-utqyjqu82cupnrd2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-12-23 10:53:13 +1100
message:
  Appropriately guard the import of AutoTimingTestResultDecorator from subunit.
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-12-22 23:47:22 +0000
+++ b/bzrlib/tests/__init__.py	2009-12-22 23:53:13 +0000
@@ -3143,6 +3143,7 @@
     concurrency = osutils.local_concurrency()
     result = []
     from subunit import TestProtocolClient, ProtocolTestCase
+    from subunit.test_results import AutoTimingTestResultDecorator
     class TestInOtherProcess(ProtocolTestCase):
         # Should be in subunit, I think. RBC.
         def __init__(self, stream, pid):
@@ -3272,9 +3273,6 @@
 ForwardingResult = testtools.ExtendedToOriginalDecorator
 
 
-from subunit.test_results import AutoTimingTestResultDecorator
-
-
 class ProfileResult(ForwardingResult):
     """Generate profiling data for all activity between start and success.
     
@@ -4297,6 +4295,7 @@
 # Only define SubUnitBzrRunner if subunit is available.
 try:
     from subunit import TestProtocolClient
+    from subunit.test_results import AutoTimingTestResultDecorator
     class SubUnitBzrRunner(TextTestRunner):
         def run(self, test):
             result = AutoTimingTestResultDecorator(