summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-04-04 17:18:56 (GMT)
committerGitHub <noreply@github.com>2018-04-04 17:18:56 (GMT)
commit1487cd14bb1e04de5b98fffc5ec41c6cf6b5d5f1 (patch)
tree732f8f6c36e65497e5e7563ea9af4bc5c676c3c8
parent4fd6c27dc8ba7ca97aa70e1ab98729f2207bbe19 (diff)
downloadcpython-1487cd14bb1e04de5b98fffc5ec41c6cf6b5d5f1.zip
cpython-1487cd14bb1e04de5b98fffc5ec41c6cf6b5d5f1.tar.gz
cpython-1487cd14bb1e04de5b98fffc5ec41c6cf6b5d5f1.tar.bz2
bpo-29922: Add more tests for error messages in 'async with'. (GH-6370)
Different paths are executed for normal exit and for leaving the 'async with' block with 'break', 'continue' or 'return'. (cherry picked from commit 2eeac269dd1e04a2a179384576986c3e47895ee0) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
-rw-r--r--Lib/test/test_coroutines.py42
1 files changed, 41 insertions, 1 deletions
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 769879f..d0b44c4 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -1243,6 +1243,7 @@ class CoroutineTest(unittest.TestCase):
def __aexit__(self, *e):
return 444
+ # Exit with exception
async def foo():
async with CM():
1/0
@@ -1270,19 +1271,58 @@ class CoroutineTest(unittest.TestCase):
def __aexit__(self, *e):
return 456
+ # Normal exit
async def foo():
nonlocal CNT
async with CM():
CNT += 1
+ with self.assertRaisesRegex(
+ TypeError,
+ "'async with' received an object from __aexit__ "
+ "that does not implement __await__: int"):
+ run_async(foo())
+ self.assertEqual(CNT, 1)
+ # Exit with 'break'
+ async def foo():
+ nonlocal CNT
+ for i in range(2):
+ async with CM():
+ CNT += 1
+ break
+ with self.assertRaisesRegex(
+ TypeError,
+ "'async with' received an object from __aexit__ "
+ "that does not implement __await__: int"):
+ run_async(foo())
+ self.assertEqual(CNT, 2)
+ # Exit with 'continue'
+ async def foo():
+ nonlocal CNT
+ for i in range(2):
+ async with CM():
+ CNT += 1
+ continue
with self.assertRaisesRegex(
TypeError,
"'async with' received an object from __aexit__ "
"that does not implement __await__: int"):
run_async(foo())
+ self.assertEqual(CNT, 3)
- self.assertEqual(CNT, 1)
+ # Exit with 'return'
+ async def foo():
+ nonlocal CNT
+ async with CM():
+ CNT += 1
+ return
+ with self.assertRaisesRegex(
+ TypeError,
+ "'async with' received an object from __aexit__ "
+ "that does not implement __await__: int"):
+ run_async(foo())
+ self.assertEqual(CNT, 4)
def test_with_9(self):