From 2c8d665ba843fe875a4b8f0ae7c7e9099a06f0dc Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 7 Jun 2018 17:06:50 +0200 Subject: [3.6] bpo-32676, test_asyncio: Fix warning in test_error_in_call_soon() (GH-7462) (GH-7483) * bpo-32676, test_asyncio: Fix warning in test_error_in_call_soon() (GH-7462) Fix " 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. --- Lib/test/test_asyncio/test_sslproto.py | 2 +- Lib/test/test_asyncio/test_tasks.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py index 9b198bf..4ffbc0f 100644 --- 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 7c51873..e8ec09e 100644 --- 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] -- cgit v0.12