Handle SystemExit with raises.

hamcrest · Oct 30, 2018 · 68bbc62 · 68bbc62
1 parent 75b4f7b
commit 68bbc62
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/devel-requirements.txt b/devel-requirements.txt
@@ -1,4 +1,3 @@
 six>=1.4
-tox>=1.8
 pytest>=2.6
 Sphinx>=1.2.2
diff --git a/pytest.ini b/pytest.ini
diff --git a/src/hamcrest/core/core/raises.py b/src/hamcrest/core/core/raises.py
@@ -28,7 +28,7 @@ def _call_function(self, function):
         self.actual = None
         try:
             function()
-        except Exception:
+        except BaseException:
             self.actual = sys.exc_info()[1]
 
             if isinstance(self.actual, self.expected):

diff --git a/tests/hamcrest_unit_test/core/raises_test.py b/tests/hamcrest_unit_test/core/raises_test.py
@@ -22,6 +22,10 @@ def raise_exception(*args, **kwargs):
     raise AssertionError(str(args) + str(kwargs))
 
 
+def raise_baseException(*args, **kwargs):
+    raise SystemExit(str(args) + str(kwargs))
+
+
 class RaisesTest(MatcherTest):
     def testMatchesIfFunctionRaisesTheExactExceptionExpected(self):
         self.assert_matches('Right exception',
@@ -38,6 +42,11 @@ def testMatchesIfFunctionRaisesASubclassOfTheExpectedException(self):
                             raises(Exception),
                             calling(raise_exception))
 
+    def testMatchesIfFunctionRaisesASubclassOfTheExpectedBaseException(self):
+        self.assert_matches('Subclassed BasedException',
+                            raises(BaseException),
+                            calling(raise_baseException))
+
     def testDoesNotMatchIfFunctionDoesNotRaiseException(self):
         self.assert_does_not_match('No exception',
                             raises(ValueError),