bpo-29922: Add more tests for error messages in 'async with'. (pythonGH-6370)

miss-islington · serhiy-storchaka · web-flow · commit 1487cd14bb1e · 2018-04-04T10:18:56.000-07:00
Different paths are executed for normal exit and for leaving the 'async with' block with 'break', 'continue' or 'return'. (cherry picked from commit 2eeac26) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
@@ -1243,6 +1243,7 @@ async def __aenter__(self):
             def __aexit__(self, *e):
                 return 444
 
+        # Exit with exception
         async def foo():
             async with CM():
                 1/0
@@ -1270,19 +1271,58 @@ async def __aenter__(self):
             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):
