diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-06-07 17:06:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 17:06:50 +0200 |
| commit | 2c8d665ba843fe875a4b8f0ae7c7e9099a06f0dc (patch) | |
| tree | b7437cbc371e773648a8b20f94b0a50fb661ed47 | |
| parent | 21f2553482c3d6ec8beb8bfa0f1fb5d23c6a4c2f (diff) | |
| download | cpython-git-2c8d665ba843fe875a4b8f0ae7c7e9099a06f0dc.tar.gz | |
[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 "<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.
| -rw-r--r-- | Lib/test/test_asyncio/test_sslproto.py | 2 | ||||
| -rw-r--r-- | 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 9b198bfd53..4ffbc0fbec 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 7c5187348b..e8ec09efd4 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] |