Skip to content

[3.7] bpo-33789: Backport test_asyncio fixes from master #7478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 3 commits into from
Jun 7, 2018
Merged

[3.7] bpo-33789: Backport test_asyncio fixes from master #7478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f4d3c9
bpo-33789: test_asyncio: Fix ResourceWarning (GH-7460)
vstinner Jun 6, 2018
455ed91
bpo-33789, test_asyncio: Hide PendingDeprecationWarning (GH-7461)
vstinner Jun 6, 2018
2429fb0
bpo-32676, test_asyncio: Fix warning in test_error_in_call_soon() (GH…
vstinner Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Lib/test/test_asyncio/functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,14 @@ def start_tls(self, ssl_context, *,
server_hostname=server_hostname,
do_handshake_on_connect=False)

ssl_sock.do_handshake()
try:
ssl_sock.do_handshake()
except:
ssl_sock.close()
raise
finally:
self.__sock.close()

self.__sock.close()
self.__sock = ssl_sock

def __getattr__(self, name):
Expand Down
5 changes: 5 additions & 0 deletions Lib/test/test_asyncio/test_sslproto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,8 @@ def server(sock):
server_side=True)
except ssl.SSLError:
pass
except OSError:
pass
finally:
sock.close()

Expand Down Expand Up @@ -636,6 +638,7 @@ def server(sock):
except ssl.SSLError:
pass
finally:
orig_sock.close()
sock.close()

async def client(addr):
Expand All @@ -649,6 +652,8 @@ async def client(addr):
writer.write(b'B')
with self.assertRaises(ssl.SSLError):
await reader.readline()

writer.close()
return 'OK'

with self.tcp_server(server,
Expand Down
9 changes: 7 additions & 2 deletions Lib/test/test_asyncio/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,7 +2178,11 @@ def coro():
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]
Expand Down Expand Up @@ -2609,7 +2613,8 @@ def done(self):
self.assertEqual(asyncio.all_tasks(loop), set())
self._register_task(task)
self.assertEqual(asyncio.all_tasks(loop), set())
self.assertEqual(asyncio.Task.all_tasks(loop), {task})
with self.assertWarns(PendingDeprecationWarning):
self.assertEqual(asyncio.Task.all_tasks(loop), {task})
self._unregister_task(task)

def test__enter_task(self):
Expand Down