diff options
author | Robert Collins <robertc@robertcollins.net> | 2014-12-11 22:16:43 +1300 |
---|---|---|
committer | Robert Collins <robertc@robertcollins.net> | 2014-12-11 22:16:43 +1300 |
commit | 669f0dbc8a993d203c0dbc874419cc2fb8c5441c (patch) | |
tree | 6f18c6306c78349c4ef2f0d7fe56caa512ed9f0d /filters | |
parent | acfc653d083d09772df32f67f90d7cc1603ed3fe (diff) | |
download | subunit-669f0dbc8a993d203c0dbc874419cc2fb8c5441c.tar.gz |
Forward stdout content in subunit-2to1.
It was always intended to be forwarded.
Closes-Bug: #1400519
Diffstat (limited to 'filters')
-rwxr-xr-x | filters/subunit-2to1 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/filters/subunit-2to1 b/filters/subunit-2to1 index 0072307..d358f66 100755 --- 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() |