Merged trunk, fixed conflict.

3 files changed, 25 insertions, 8 deletions

diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index b385e9b..8352585 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -153,7 +153,7 @@ from subunit.v2 import ByteStreamToStreamResult, StreamResultToBytes
 # If the releaselevel is 'final', then the tarball will be major.minor.micro.
 # Otherwise it is major.minor.micro~$(revno).
 
-__version__ = (0, 0, 15, 'final', 0)
+__version__ = (0, 0, 16, 'final', 0)
 
 PROGRESS_SET = 0
 PROGRESS_CUR = 1
diff --git a/python/subunit/run.py b/python/subunit/run.py
index b4ffdb3..7e4d783 100755
--- a/python/subunit/run.py
+++ b/python/subunit/run.py
@@ -33,6 +33,7 @@ from testtools.run import (
     BUFFEROUTPUT,
     CATCHBREAK,
     FAILFAST,
+    list_test,
     TestProgram,
     USAGE_AS_MAIN,
     )
@@ -51,7 +52,7 @@ class SubunitTestRunner(object):
 
     def run(self, test):
         "Run the given test case or test suite."
-        result = self._list(test)
+        result, _ = self._list(test)
         result = ExtendedToStreamDecorator(result)
         result = AutoTimingTestResultDecorator(result)
         if self.failfast is not None:
@@ -65,9 +66,15 @@ class SubunitTestRunner(object):
 
     def list(self, test):
         "List the test."
-        self._list(test)
+        result, errors = self._list(test)
+        if errors:
+            failed_descr = '\n'.join(errors).encode('utf8')
+            result.status(file_name="import errors", runnable=False,
+                file_bytes=failed_descr, mime_type="text/plain;charset=utf8")
+            sys.exit(2)
 
     def _list(self, test):
+        test_ids, errors = list_test(test)
         try:
             fileno = self.stream.fileno()
         except:
@@ -77,9 +84,9 @@ class SubunitTestRunner(object):
         else:
             stream = self.stream
         result = StreamResultToBytes(stream)
-        for case in iterate_tests(test):
-            result.status(test_id=case.id(), test_status='exists')
-        return result
+        for test_id in test_ids:
+            result.status(test_id=test_id, test_status='exists')
+        return result, errors
 
 
 class SubunitTestProgram(TestProgram):
diff --git a/python/subunit/tests/test_run.py b/python/subunit/tests/test_run.py
index 0ca5a51..6ac84e1 100644
--- a/python/subunit/tests/test_run.py
+++ b/python/subunit/tests/test_run.py
@@ -17,14 +17,15 @@
 from testtools.compat import BytesIO
 import unittest
 
-from testtools import PlaceHolder
+from testtools import PlaceHolder, TestCase
 from testtools.testresult.doubles import StreamResult
 
 import subunit
+from subunit import run
 from subunit.run import SubunitTestRunner
 
 
-class TestSubunitTestRunner(unittest.TestCase):
+class TestSubunitTestRunner(TestCase):
 
     def test_includes_timing_output(self):
         io = BytesIO()
@@ -52,3 +53,12 @@ class TestSubunitTestRunner(unittest.TestCase):
             ('status', 'name1', 'exists'),
             ('status', 'name2', 'exists'),
             ], [event[:3] for event in eventstream._events[:2]])
+
+    def test_list_errors_if_errors_from_list_test(self):
+        io = BytesIO()
+        runner = SubunitTestRunner(stream=io)
+        def list_test(test):
+            return [], ['failed import']
+        self.patch(run, 'list_test', list_test)
+        exc = self.assertRaises(SystemExit, runner.list, None)
+        self.assertEqual((2,), exc.args)