From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 2 Feb 2018 05:57:28 +0000 (-0800)
Subject: bpo-32733: Make test_coroutines robust against -Werror (GH-5487) (GH-5490)
X-Git-Tag: v3.7.0b2~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=709f6ad7f84855ebdbe3e7702571b0e1447b885b;p=python

bpo-32733: Make test_coroutines robust against -Werror (GH-5487) (GH-5490)

(cherry picked from commit 2efb9735899c7c642f3e75a121af82b1679577d3)

Co-authored-by: Nathaniel J. Smith <njs@pobox.com>
---

diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index f3d77192ae..b37b61b719 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -2152,15 +2152,10 @@ class OriginTrackingTest(unittest.TestCase):
 
         def check(depth, msg):
             sys.set_coroutine_origin_tracking_depth(depth)
-            with warnings.catch_warnings(record=True) as wlist:
+            with self.assertWarns(RuntimeWarning) as cm:
                 a2()
                 support.gc_collect()
-            # This might be fragile if other warnings somehow get triggered
-            # inside our 'with' block... let's worry about that if/when it
-            # happens.
-            self.assertTrue(len(wlist) == 1)
-            self.assertIs(wlist[0].category, RuntimeWarning)
-            self.assertEqual(msg, str(wlist[0].message))
+            self.assertEqual(msg, str(cm.warning))
 
         orig_depth = sys.get_coroutine_origin_tracking_depth()
         try: