From 4552921810018e94f408ddbc47a2eb13e5672cf4 Mon Sep 17 00:00:00 2001 From: Lisa Roach Date: Sun, 11 Oct 2020 14:37:20 -0700 Subject: [PATCH 1/3] [bpo-39101] Fixes BaseException hang in IsolatedAsyncioTestCase. --- Lib/unittest/async_case.py | 2 +- Lib/unittest/test/test_async_case.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Lib/unittest/async_case.py b/Lib/unittest/async_case.py index 1bc1312c8c2ee9..9f22e4d6da3559 100644 --- a/Lib/unittest/async_case.py +++ b/Lib/unittest/async_case.py @@ -104,7 +104,7 @@ async def _asyncioLoopRunner(self, fut): fut.set_result(ret) except asyncio.CancelledError: raise - except Exception as ex: + except BaseException as ex: if not fut.cancelled(): fut.set_exception(ex) diff --git a/Lib/unittest/test/test_async_case.py b/Lib/unittest/test/test_async_case.py index 2db441da202a01..fd3103fd94cf42 100644 --- a/Lib/unittest/test/test_async_case.py +++ b/Lib/unittest/test/test_async_case.py @@ -190,6 +190,24 @@ async def on_async_cleanup(self, val): 'async_cleanup 2', 'sync_cleanup 1']) + def test_base_exception_from_async_method(self): + events = [] + class Test(unittest.IsolatedAsyncioTestCase): + async def test_a(self): + events.append("test_a") + raise BaseException() + events.append("not it") + + async def test_b(self): + events.append("test_b") + + test = Test("test_a") + output = test.run() + self.assertFalse(output.wasSuccessful()) + + test = Test("test_b") + test.run() + self.assertEqual(events, ['test_a', 'test_b']) if __name__ == "__main__": unittest.main() From 34af5d183e4e2bc38046526eb81f6a636ae7c33a Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Sun, 11 Oct 2020 21:43:06 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NEWS.d/next/Library/2020-10-11-21-43-03.bpo-39101.-I49Pm.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2020-10-11-21-43-03.bpo-39101.-I49Pm.rst diff --git a/Misc/NEWS.d/next/Library/2020-10-11-21-43-03.bpo-39101.-I49Pm.rst b/Misc/NEWS.d/next/Library/2020-10-11-21-43-03.bpo-39101.-I49Pm.rst new file mode 100644 index 00000000000000..a571e8343cde12 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-10-11-21-43-03.bpo-39101.-I49Pm.rst @@ -0,0 +1 @@ +Fixed tests using IsolatedAsyncioTestCase from hanging on BaseExceptions. \ No newline at end of file From 1e268cb751d8350d754aa1a887524e3d146617cd Mon Sep 17 00:00:00 2001 From: Lisa Roach Date: Sat, 24 Oct 2020 15:32:55 -0700 Subject: [PATCH 3/3] Moves System and Keyboard exception to use raise, Cancelled does not. --- Lib/unittest/async_case.py | 4 ++-- Lib/unittest/test/test_async_case.py | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Lib/unittest/async_case.py b/Lib/unittest/async_case.py index 9f22e4d6da3559..520213c3727555 100644 --- a/Lib/unittest/async_case.py +++ b/Lib/unittest/async_case.py @@ -102,9 +102,9 @@ async def _asyncioLoopRunner(self, fut): ret = await awaitable if not fut.cancelled(): fut.set_result(ret) - except asyncio.CancelledError: + except (SystemExit, KeyboardInterrupt): raise - except BaseException as ex: + except (BaseException, asyncio.CancelledError) as ex: if not fut.cancelled(): fut.set_exception(ex) diff --git a/Lib/unittest/test/test_async_case.py b/Lib/unittest/test/test_async_case.py index fd3103fd94cf42..d01864b6936ca8 100644 --- a/Lib/unittest/test/test_async_case.py +++ b/Lib/unittest/test/test_async_case.py @@ -193,21 +193,30 @@ async def on_async_cleanup(self, val): def test_base_exception_from_async_method(self): events = [] class Test(unittest.IsolatedAsyncioTestCase): - async def test_a(self): - events.append("test_a") + async def test_base(self): + events.append("test_base") raise BaseException() events.append("not it") - async def test_b(self): - events.append("test_b") + async def test_no_err(self): + events.append("test_no_err") - test = Test("test_a") + async def test_cancel(self): + raise asyncio.CancelledError() + + test = Test("test_base") output = test.run() self.assertFalse(output.wasSuccessful()) - test = Test("test_b") + test = Test("test_no_err") test.run() - self.assertEqual(events, ['test_a', 'test_b']) + self.assertEqual(events, ['test_base', 'test_no_err']) + + test = Test("test_cancel") + output = test.run() + self.assertFalse(output.wasSuccessful()) + + if __name__ == "__main__": unittest.main()