Convert subunit.run to v2.

1 files changed, 9 insertions, 3 deletions

diff --git a/python/subunit/run.py b/python/subunit/run.py
index b5ccea4..479691d 100755
--- a/python/subunit/run.py
+++ b/python/subunit/run.py
@@ -22,7 +22,9 @@
 
 import sys
 
-from subunit import TestProtocolClient, get_default_formatter
+from testtools import ExtendedToStreamDecorator
+
+from subunit import StreamResultToBytes, get_default_formatter
 from subunit.test_results import AutoTimingTestResultDecorator
 from testtools.run import (
     BUFFEROUTPUT,
@@ -46,11 +48,15 @@ class SubunitTestRunner(object):
 
     def run(self, test):
         "Run the given test case or test suite."
-        result = TestProtocolClient(self.stream)
+        result = ExtendedToStreamDecorator(StreamResultToBytes(self.stream))
         result = AutoTimingTestResultDecorator(result)
         if self.failfast is not None:
             result.failfast = self.failfast
-        test(result)
+        result.startTestRun()
+        try:
+            test(result)
+        finally:
+            result.stopTestRun()
         return result