wrapper around TestProgram to catch SystemExit

SalmonMode · Jun 22, 2017 · 72796b2 · 72796b2
1 parent 52ca76e
commit 72796b2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/contextional/tests/test_failure.py b/contextional/tests/test_failure.py
@@ -2,19 +2,22 @@
 
 import unittest
 
-from contextional.tests.tools import SilentTestRunner
+from contextional.tests.tools import (
+    SilentTestRunner,
+    TestingTestProgram,
+)
 from contextional.tests.failure import expected_stream_output
 
 
 class TestFailureResult(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        test_program = unittest.main(
+        test_program = TestingTestProgram(
             module="contextional.tests.failure",
             testRunner=SilentTestRunner,
             argv=["contextional/tests/test_failure.py"],
-            exit=False,
+            # exit=False,
         )
         cls.test_results = test_program.result
         cls.stream_output = cls.test_results.test_run_output

diff --git a/contextional/tests/test_success.py b/contextional/tests/test_success.py
@@ -2,20 +2,26 @@
 
 import unittest
 
-from contextional.tests.tools import SilentTestRunner
+from contextional.tests.tools import (
+    SilentTestRunner,
+    TestingTestProgram,
+)
 from contextional.tests.success import expected_stream_output
 
 
 class TestSuccessResult(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        test_program = unittest.main(
-            module="contextional.tests.success",
-            testRunner=SilentTestRunner,
-            argv=["contextional/tests/test_success.py"],
-            exit=False,
-        )
+        try:
+            test_program = TestingTestProgram(
+                module="contextional.tests.success",
+                testRunner=SilentTestRunner,
+                argv=["contextional/tests/test_success.py"],
+                # exit=False,
+            )
+        except SystemExit:
+            pass
         cls.test_results = test_program.result
         cls.stream_output = cls.test_results.test_run_output
 

diff --git a/contextional/tests/tools.py b/contextional/tests/tools.py
@@ -3,6 +3,7 @@
 from unittest import (
     _TextTestResult,
     TextTestRunner,
+    TestProgram,
 )
 
 
@@ -32,3 +33,12 @@ def __init__(self, *args, **kwargs):
         kwargs["verbosity"] = 2
         kwargs["resultclass"] = TextTestResultHolder
         super(SilentTestRunner, self).__init__(*args, **kwargs)
+
+
+class TestingTestProgram(TestProgram):
+
+    def runTests(self):
+        try:
+            super(TestingTestProgram, self).runTests()
+        except SystemExit:
+            pass