* V2 parser errors now set appropriate mime types for the encapsulated packet
data and the error message. (Robert Collins)
+IMPROVEMENTS
+~~~~~~~~~~~~
+
+* Most filters will now accept a file path argument instead of only reading
+ from stdin. (Robert Collins, #409206)
+
0.0.15
------
from testtools import ExtendedToStreamDecorator
from subunit import StreamResultToBytes
-from subunit.filters import run_tests_from_stream
+from subunit.filters import find_stream, run_tests_from_stream
def make_options(description):
def main():
parser = make_options(__doc__)
(options, args) = parser.parse_args()
- run_tests_from_stream(sys.stdin,
+ run_tests_from_stream(find_stream(sys.stdin, args),
ExtendedToStreamDecorator(StreamResultToBytes(sys.stdout)))
sys.exit(0)
from testtools import StreamToExtendedDecorator
from subunit import ByteStreamToStreamResult, TestProtocolClient
-from subunit.filters import run_tests_from_stream
+from subunit.filters import find_stream, run_tests_from_stream
def make_options(description):
def main():
parser = make_options(__doc__)
(options, args) = parser.parse_args()
- case = ByteStreamToStreamResult(sys.stdin, non_subunit_name='stdout')
+ case = ByteStreamToStreamResult(
+ find_stream(sys.stdin, args), non_subunit_name='stdout')
result = StreamToExtendedDecorator(TestProtocolClient(sys.stdout))
# What about stdout chunks?
result.startTestRun()
StreamResultToBytes,
read_test_list,
)
-from subunit.filters import filter_by_result
+from subunit.filters import filter_by_result, find_stream
from subunit.test_results import (
and_predicates,
make_tag_filter,
output_path=None,
passthrough=(not options.no_passthrough),
forward=False,
- protocol_version=2)
+ protocol_version=2,
+ input_stream=find_stream(sys.stdin, args))
sys.exit(0)
StreamSummary)
from subunit import ByteStreamToStreamResult
-from subunit.filters import run_tests_from_stream
+from subunit.filters import find_stream, run_tests_from_stream
from subunit.test_results import (
CatFiles,
TestIdPrintingResult,
parser.add_option("--no-passthrough", action="store_true",
help="Hide all non subunit input.", default=False, dest="no_passthrough")
(options, args) = parser.parse_args()
-test = ByteStreamToStreamResult(sys.stdin, non_subunit_name="stdout")
+test = ByteStreamToStreamResult(
+ find_stream(sys.stdin, args), non_subunit_name="stdout")
result = TestIdPrintingResult(sys.stdout, options.times, options.exists)
if not options.no_passthrough:
result = StreamResultRouter(result)
from testtools import StreamToExtendedDecorator, DecorateTestCaseResult, StreamResultRouter
from subunit import ByteStreamToStreamResult
+from subunit.filters import find_stream
from subunit.test_results import CatFiles
parser = OptionParser(description=__doc__)
help="Use bzrlib's test reporter (requires bzrlib)",
default=False)
(options, args) = parser.parse_args()
-test = ByteStreamToStreamResult(sys.stdin, non_subunit_name='stdout')
+test = ByteStreamToStreamResult(
+ find_stream(sys.stdin, args), non_subunit_name='stdout')
def wrap_result(result):
result = StreamToExtendedDecorator(result)
if not options.no_passthrough:
result = filter_by_result(
result_factory, options.output_to, not options.no_passthrough,
options.forward, protocol_version=protocol_version,
- passthrough_subunit=passthrough_subunit)
+ passthrough_subunit=passthrough_subunit,
+ input_stream=find_stream(sys.stdin, args))
if post_run_hook:
post_run_hook(result)
if not safe_hasattr(result, 'wasSuccessful'):
sys.exit(0)
else:
sys.exit(1)
+
+
+def find_stream(stdin, argv):
+ """Find a stream to use as input for filters.
+
+ :param stdin: Standard in - used if no files are named in argv.
+ :param argv: Command line arguments after option parsing. If one file
+ is named, that is opened in read only binary mode and returned.
+ A missing file will raise an exception, as will multiple file names.
+ """
+ assert len(argv) < 2, "Too many filenames."
+ if argv:
+ return open(argv[0], 'rb')
+ else:
+ return stdin
from subunit.tests import (
test_chunked,
test_details,
+ test_filters,
test_progress_model,
test_run,
test_subunit_filter,
loader = TestLoader()
result = loader.loadTestsFromModule(test_chunked)
result.addTest(loader.loadTestsFromModule(test_details))
+ result.addTest(loader.loadTestsFromModule(test_filters))
result.addTest(loader.loadTestsFromModule(test_progress_model))
result.addTest(loader.loadTestsFromModule(test_test_results))
result.addTest(loader.loadTestsFromModule(test_test_protocol))
--- /dev/null
+#
+# subunit: extensions to Python unittest to get test results from subprocesses.
+# Copyright (C) 2013 Robert Collins <robertc@robertcollins.net>
+#
+# Licensed under either the Apache License, Version 2.0 or the BSD 3-clause
+# license at the users choice. A copy of both licenses are available in the
+# project source as Apache-2.0 and BSD. You may not use this file except in
+# compliance with one of these two licences.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under these licenses is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# license you chose for the specific language governing permissions and
+# limitations under that license.
+#
+
+import sys
+from tempfile import NamedTemporaryFile
+
+from testtools import TestCase
+
+from subunit.filters import find_stream
+
+
+class TestFindStream(TestCase):
+
+ def test_no_argv(self):
+ self.assertEqual('foo', find_stream('foo', []))
+
+ def test_opens_file(self):
+ f = NamedTemporaryFile()
+ f.write(b'foo')
+ f.flush()
+ stream = find_stream('bar', [f.name])
+ self.assertEqual(b'foo', stream.read())
git.samba.org / third_party / subunit / commitdiff