traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-32458: Further tune start_tls tests (GH-7166) 

(cherry picked from commit 8267ea2e84)

Co-authored-by: Yury Selivanov <yury@magic.io>
This commit is contained in:
Miss Islington (bot) 2018-05-28 13:44:12 -07:00 committed by GitHub
parent 3757939e9c
commit 4b828467a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_asyncio/test_sslproto.py
View File

@ -293,7 +293,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
new_tr.close() new_tr.close()
with self.tcp_server(serve) as srv: with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete( self.loop.run_until_complete(
asyncio.wait_for(client(srv.addr), loop=self.loop, timeout=10)) asyncio.wait_for(client(srv.addr), loop=self.loop, timeout=10))
@ -358,7 +358,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
new_tr.close() new_tr.close()
with self.tcp_server(serve) as srv: with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete( self.loop.run_until_complete(
asyncio.wait_for(client(srv.addr), asyncio.wait_for(client(srv.addr),
loop=self.loop, timeout=self.TIMEOUT)) loop=self.loop, timeout=self.TIMEOUT))
@ -412,7 +412,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
new_tr = await self.loop.start_tls( new_tr = await self.loop.start_tls(
tr, proto, server_context, tr, proto, server_context,
server_side=True) server_side=True,
ssl_handshake_timeout=self.TIMEOUT)
await on_eof await on_eof
await on_con_lost await on_con_lost
@ -429,7 +430,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
lambda: proto, '127.0.0.1', 0) lambda: proto, '127.0.0.1', 0)
addr = server.sockets[0].getsockname() addr = server.sockets[0].getsockname()
with self.tcp_client(lambda sock: client(sock, addr)): with self.tcp_client(lambda sock: client(sock, addr),
timeout=self.TIMEOUT):
await asyncio.wait_for( await asyncio.wait_for(
main(proto, on_con, on_eof, on_con_lost), main(proto, on_con, on_eof, on_con_lost),
loop=self.loop, timeout=self.TIMEOUT) loop=self.loop, timeout=self.TIMEOUT)