* Most filters will now accept a file path argument instead of only reading

  from stdin. (Robert Collins, #409206)

3 files changed, 54 insertions, 1 deletions

diff --git a/python/subunit/filters.py b/python/subunit/filters.py
index 5ad3c53..0a0a185 100644
--- a/python/subunit/filters.py
+++ b/python/subunit/filters.py
@@ -179,7 +179,8 @@ def run_filter_script(result_factory, description, post_run_hook=None,
     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'):
@@ -188,3 +189,18 @@ def run_filter_script(result_factory, description, post_run_hook=None,
         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
diff --git a/python/subunit/tests/__init__.py b/python/subunit/tests/__init__.py
index 3552eff..a3caa38 100644
--- a/python/subunit/tests/__init__.py
+++ b/python/subunit/tests/__init__.py
@@ -19,6 +19,7 @@ from unittest import TestLoader
 from subunit.tests import (
     test_chunked,
     test_details,
+    test_filters,
     test_progress_model,
     test_run,
     test_subunit_filter,
@@ -34,6 +35,7 @@ def test_suite():
     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))
diff --git a/python/subunit/tests/test_filters.py b/python/subunit/tests/test_filters.py
new file mode 100644
index 0000000..0a5e7c7
--- /dev/null
+++ b/python/subunit/tests/test_filters.py
@@ -0,0 +1,35 @@
+#
+#  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())