Merge pull request #335 from bukzor/systemexit-test

fixed exception handling for SystemExit and KeyboardInterrupt, and tests

examples/keyboardinterrupt/discovery.py

@@ -0,0 +1,2 @@
+""""this example throws KeyboardInterrupt during discovery"""
+raise KeyboardInterrupt('fake!')

examples/keyboardinterrupt/setup.py

@@ -0,0 +1,13 @@
+"""this example throws KeyboardInterrupt during fixture setup"""
+import testify as T
+
+
+class Test(T.TestCase):
+    def setUp(self):
+        raise KeyboardInterrupt('fake!')
+
+    def test1(self):
+        pass
+
+    def test2(self):
+        pass

examples/keyboardinterrupt/teardown.py

@@ -0,0 +1,15 @@
+"""this example throws KeyboardInterrupt during fixture teardown"""
+import testify as T
+
+
+class Test(T.TestCase):
+    @T.setup_teardown
+    def fixture(self):
+        yield
+        raise KeyboardInterrupt('fake!')
+
+    def test1(self):
+        pass
+
+    def test2(self):
+        pass

examples/keyboardinterrupt/test.py

@@ -0,0 +1,10 @@
+"""this example throws KeyboardInterrupt during testing"""
+import testify as T
+
+
+class Test(T.TestCase):
+    def test1(self):
+        raise KeyboardInterrupt('fake!')
+
+    def test2(self):
+        raise KeyboardInterrupt('fake!')

examples/systemexit/discovery.py

@@ -0,0 +1,3 @@
+""""this example throws SystemExit during discovery"""
+import sys
+sys.exit('fake!')

examples/systemexit/test.py

@@ -0,0 +1,8 @@
+"""this example throws SystemExit during testing"""
+import testify as T
+import sys
+
+
+class Test(T.TestCase):
+    def test(self):
+        sys.exit('fake!')

testify/__init__.py

@@ -31,7 +31,7 @@
 
 from .assertions import *
 
-from .errors import TestifyError
+from .exceptions import TestifyError
 
 from .test_case import (
     MetaTestCase,

testify/exceptions.py

@@ -0,0 +1,14 @@
+class Testify(Exception):
+    pass
+
+
+class TestifyError(Testify):
+    pass
+
+
+class DiscoveryError(TestifyError):
+    pass
+
+
+class Interruption(Testify):
+    pass

testify/test_case.py

@@ -20,13 +20,13 @@
 from collections import defaultdict
 import functools
 import inspect
-import sys
 import types
 import unittest
 
 import six
 
 from testify import test_fixtures
+from testify.exceptions import Interruption
 from testify.utils import class_logger
 from testify.test_fixtures import DEPRECATED_FIXTURE_TYPE_MAP
 from testify.test_fixtures import TestFixtures
@@ -303,14 +303,13 @@ def __run_test_methods(self, class_fixture_failures):
                 for exc_info in fixture_failures:
                     result.end_in_failure(exc_info)
 
+                if result.interrupted:
+                    raise Interruption
+
                 # if nothing's gone wrong, it's not about to start
                 if not result.complete:
                     result.end_in_success()
 
-            except (KeyboardInterrupt, SystemExit):
-                result.end_in_interruption(sys.exc_info())
-                raise
-
             finally:
                 self.fire_event(self.EVENT_ON_COMPLETE_TEST_METHOD, result)
 

testify/test_discovery.py

@@ -20,11 +20,7 @@
 import traceback
 import unittest
 from .test_case import MetaTestCase, TestifiedUnitTest
-from .errors import TestifyError
-
-
-class DiscoveryError(TestifyError):
-    pass
+from .exceptions import DiscoveryError
 
 
 def to_module(path):
@@ -97,7 +93,9 @@ def discover(what):
             submod = __import__(module_name, fromlist=[str('__trash')])
             for cls in get_test_classes_from_module(submod):
                 yield cls
-    except Exception:
+    except GeneratorExit:
+        raise
+    except BaseException:
         # print the traceback to stderr, or else we can't see errors during --list-tests > testlist
         traceback.print_exc()
         raise DiscoveryError(

testify/test_fixtures.py

@@ -1,7 +1,6 @@
 import contextlib
 import inspect
 import itertools
-import sys
 
 import six
 
@@ -193,9 +192,6 @@ def run_fixture(self, fixture, function_to_call, enter_callback=None, exit_callb
                 result.end_in_success()
             else:
                 return result.exception_infos
-        except (KeyboardInterrupt, SystemExit):
-            result.end_in_interruption(sys.exc_info())
-            raise
         finally:
             if exit_callback:
                 exit_callback(result)

testify/test_logger.py

@@ -194,15 +194,14 @@ def report_test_result(self, result):
             }[status]
 
             if status in ('fail', 'error'):
-                self.writeln("%s: %s\n%s" % (status, self._format_test_method_name(result['method']), result['exception_info']))
+                self.writeln("\n%s: %s\n%s" % (status, self._format_test_method_name(result['method']), result['exception_info']))
 
             if self.options.verbosity == VERBOSITY_NORMAL:
                 self.write(self._colorize(status_letter, color))
+            elif result['normalized_run_time']:
+                self.writeln("%s in %s" % (self._colorize(status_description, color), result['normalized_run_time']))
             else:
-                if result['normalized_run_time']:
-                    self.writeln("%s in %s" % (self._colorize(status_description, color), result['normalized_run_time']))
-                else:
-                    self.writeln(self._colorize(status_description, color))
+                self.writeln(self._colorize(status_description, color))
 
     def heading(self, *messages):
         self.writeln("")

testify/test_result.py

@@ -81,9 +81,7 @@ def record(self, function):
         """
         try:
             function()
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except Exception as exception:
+        except BaseException as exception:
             # some code may want to use an alternative exc_info for an exception
             # (for instance, in an event loop). You can signal an alternative
             # stack to use by adding a _testify_exc_tb attribute to the
@@ -125,6 +123,8 @@ def end_in_failure(self, exception_info):
         if isinstance(exception_info[1], AssertionError):
             # test failure, kinda expect these vs. unknown errors
             self.failure = True
+        elif isinstance(exception_info[1], KeyboardInterrupt):
+            self.interrupted = True
         else:
             self.error = True
 
@@ -135,12 +135,6 @@ def end_in_success(self):
             self._complete()
             self.success = True
 
-    def end_in_interruption(self, exception_info):
-        if not self.complete:
-            self._complete()
-            self.interrupted = True
-            self.exception_infos.append(exception_info)
-
     def __make_multi_error_message(self, formatter):
         result = []
         for exception_info in self.exception_infos:

testify/test_runner.py

@@ -26,6 +26,7 @@
 from .test_case import MetaTestCase, TestCase
 from . import test_discovery
 from . import exit
+from . import exceptions
 
 
 __author__ = "Oliver Nicholas <bigo@yelp.com>"
@@ -172,12 +173,12 @@ def failure_counter(result_dict):
                 # And we finally execute our finely wrapped test case
                 runnable()
 
-        except test_discovery.DiscoveryError as exc:
+        except exceptions.DiscoveryError as exc:
             for reporter in self.test_reporters:
                 reporter.test_discovery_failure(exc)
             return exit.DISCOVERY_FAILED
-        except KeyboardInterrupt:
-            # we'll catch and pass a keyboard interrupt so we can cancel in the middle of a run
+        except exceptions.Interruption:
+            # handle interruption so we can cancel in the middle of a run
             # but still get a testing summary.
             pass