From: Victor Stinner <vstinner@redhat.com>
Date: Sun, 2 Jun 2019 23:35:37 +0000 (+0200)
Subject: bpo-37100: Fix test_coroutines with -Werror (GH-13756)
X-Git-Tag: v3.8.0b1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cf7ea1272fbc921a89acdbe40ca152813028cb5;p=python

bpo-37100: Fix test_coroutines with -Werror (GH-13756)

test_coroutines: test_unawaited_warning_when_module_broken() now uses
support.check_warnings() to catch expected RuntimeWarning.
---

diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 0e7eb3a1af..b406b1c3eb 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -2250,7 +2250,8 @@ class OriginTrackingTest(unittest.TestCase):
         try:
             warnings._warn_unawaited_coroutine = lambda coro: 1/0
             with support.catch_unraisable_exception() as cm, \
-                 support.captured_stderr() as stream:
+                 support.check_warnings((r'coroutine .* was never awaited',
+                                         RuntimeWarning)):
                 # only store repr() to avoid keeping the coroutine alive
                 coro = corofn()
                 coro_repr = repr(coro)
@@ -2261,13 +2262,12 @@ class OriginTrackingTest(unittest.TestCase):
 
                 self.assertEqual(repr(cm.unraisable.object), coro_repr)
                 self.assertEqual(cm.unraisable.exc_type, ZeroDivisionError)
-                self.assertIn("was never awaited", stream.getvalue())
 
             del warnings._warn_unawaited_coroutine
-            with support.captured_stderr() as stream:
+            with support.check_warnings((r'coroutine .* was never awaited',
+                                         RuntimeWarning)):
                 corofn()
                 support.gc_collect()
-            self.assertIn("was never awaited", stream.getvalue())
 
         finally:
             warnings._warn_unawaited_coroutine = orig_wuc