[3.6] bpo-32676, test_asyncio: Fix warning in test_error_in_call_soon() (GH-7462...

* bpo-32676, test_asyncio: Fix warning in test_error_in_call_soon() (GH-7462)

Fix "<CoroWrapper ...> was never yielded from" warning in
PyTask_PyFuture_Tests.test_error_in_call_soon() of
test_asyncio.test_tasks.

Close manually the coroutine on error.

(cherry picked from commit 9f04f0df6fdb27190690bda949d213893d14e807)

* Hide a warning in test_asyncio test_cancel_handshake()

SslProtoHandshakeTests.test_cancel_handshake() of
test_asyncio.test_sslproto: hide a traceback about SSL handshake
failure.

diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 9b198bfd53074a79fec38afcdfaa566bc4088639..4ffbc0fbec6babbb61419f130f92e8d2be1b7eec 100644 (file)
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -59,9 +59,9 @@ class SslProtoHandshakeTests(test_utils.TestCase):
             return []
 
         waiter.cancel()
-        self.connection_made(ssl_proto, do_handshake=do_handshake)
 
         with test_utils.disable_logger():
+            self.connection_made(ssl_proto, do_handshake=do_handshake)
             self.loop.run_until_complete(handshake_fut)
 
     def test_eof_received_waiter(self):

diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 7c5187348bc4aca0573de39e7176b03b319424ce..e8ec09efd4ad98bd53f87b1a0f1ebb7a65773cce 100644 (file)
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -2076,7 +2076,11 @@ class BaseTaskTests:
         self.assertFalse(m_log.error.called)
 
         with self.assertRaises(ValueError):
-            self.new_task(self.loop, coro())
+            gen = coro()
+            try:
+                self.new_task(self.loop, gen)
+            finally:
+                gen.close()
 
         self.assertTrue(m_log.error.called)
         message = m_log.error.call_args[0][0]