From 1a33b2f35b9195b440b492afa87dcf83ba2ecca4 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Tue, 1 Oct 2013 23:24:56 +1000 Subject: Close #19092: ExitStack now reraises exceptions from __exit__ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Report and patch by Hrvoje Nikšić --- Lib/test/test_contextlib.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'Lib/test') diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py index e52ed91a58..9e45f70f85 100644 --- a/Lib/test/test_contextlib.py +++ b/Lib/test/test_contextlib.py @@ -573,6 +573,43 @@ class TestExitStack(unittest.TestCase): self.assertIsInstance(inner_exc, ValueError) self.assertIsInstance(inner_exc.__context__, ZeroDivisionError) + def test_exit_exception_non_suppressing(self): + # http://bugs.python.org/issue19092 + def raise_exc(exc): + raise exc + + def suppress_exc(*exc_details): + return True + + try: + with ExitStack() as stack: + stack.callback(lambda: None) + stack.callback(raise_exc, IndexError) + except Exception as exc: + self.assertIsInstance(exc, IndexError) + else: + self.fail("Expected IndexError, but no exception was raised") + + try: + with ExitStack() as stack: + stack.callback(raise_exc, KeyError) + stack.push(suppress_exc) + stack.callback(raise_exc, IndexError) + except Exception as exc: + self.assertIsInstance(exc, KeyError) + else: + self.fail("Expected KeyError, but no exception was raised") + + def test_body_exception_suppress(self): + def suppress_exc(*exc_details): + return True + try: + with ExitStack() as stack: + stack.push(suppress_exc) + 1/0 + except IndexError as exc: + self.fail("Expected no exception, got IndexError") + def test_exit_exception_chaining_suppress(self): with ExitStack() as stack: stack.push(lambda *exc: True) -- cgit v1.2.1