Forward stdout content in subunit-2to1.

[third_party/subunit] / filters / subunit-2to1

diff --git a/filters/subunit-2to1 b/filters/subunit-2to1
index 0072307f0fb7954da6e0096ec4dc2364c8237adf..d358f664fc6b77164e325e8e06996328b9e31d38 100755 (executable)
--- a/filters/subunit-2to1
+++ b/filters/subunit-2to1
@@ -19,10 +19,14 @@
 from optparse import OptionParser
 import sys
 
-from testtools import StreamToExtendedDecorator
+from testtools import (
+    StreamToExtendedDecorator,
+    StreamResultRouter,
+    )
 
 from subunit import ByteStreamToStreamResult, TestProtocolClient
 from subunit.filters import find_stream, run_tests_from_stream
+from subunit.test_results import CatFiles
 
 
 def make_options(description):
@@ -36,7 +40,9 @@ def main():
     case = ByteStreamToStreamResult(
         find_stream(sys.stdin, args), non_subunit_name='stdout')
     result = StreamToExtendedDecorator(TestProtocolClient(sys.stdout))
-    # What about stdout chunks?
+    result = StreamResultRouter(result)
+    cat = CatFiles(sys.stdout)
+    result.add_rule(cat, 'test_id', test_id=None)
     result.startTestRun()
     case.run(result)
     result.stopTestRun()