Merge SUBUNIT_FORMATTER patch.

3 files changed, 25 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 9646c3c..85c5bb0 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,15 @@ BUG FIXES
 * make check was failing if subunit wasn't installed due to a missing include
   path for the test program test_child.
 
+IMPROVEMENTS
+~~~~~~~~~~~~
+
+* New filter `subunit-notify` that will show a notification window with test 
+  statistics when the test run finishes.
+
+* subunit.run will now pipe its output to the command in the 
+  SUBUNIT_FORMATTER environment variable, if set.
+
 0.0.4
 -----
 
@@ -22,12 +31,6 @@ BUG FIXES
 
 * Building with autoconf 2.65 is now supported.
 
-IMPROVEMENTS
-~~~~~~~~~~~~
-
-* New filter `subunit-notify` that will show a notification window with test 
-  statistics when the test run finishes.
-
 
 0.0.3
 -----
diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index 73dbc17..6b65ae4 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -1111,3 +1111,16 @@ class TestResultStats(unittest.TestResult):
     def wasSuccessful(self):
         """Tells whether or not this result was a success"""
         return self.failed_tests == 0
+
+
+def get_default_formatter():
+    """Obtain the default formatter to write to.
+    
+    :return: A file-like object.
+    """
+    formatter = os.getenv("SUBUNIT_FORMATTER")
+    if formatter:
+        return os.popen(formatter, "w")
+    else:
+        return sys.stdout
+
diff --git a/python/subunit/run.py b/python/subunit/run.py
index 2b90791..01c0b0e 100755
--- a/python/subunit/run.py
+++ b/python/subunit/run.py
@@ -22,7 +22,7 @@
 
 import sys
 
-from subunit import TestProtocolClient
+from subunit import TestProtocolClient, get_default_formatter
 
 
 class SubunitTestRunner(object):
@@ -41,6 +41,7 @@ if __name__ == '__main__':
     from unittest import TestProgram
     parser = optparse.OptionParser(__doc__)
     args = parser.parse_args()[1]
-    runner = SubunitTestRunner()
+    stream = get_default_formatter()
+    runner = SubunitTestRunner(stream)
     program = TestProgram(module=None, argv=[sys.argv[0]] + args,
                           testRunner=runner)