diff options
| author | Yury Selivanov <yury@magic.io> | 2018-05-28 19:48:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 19:48:59 (GMT) |
| commit | 8267ea2e84d355f00654dec3ad782fc7b1f680f1 (patch) | |
| tree | ce7a6b12173c4a91a170e9f1263e8f63067ece9d /Lib | |
| parent | e97ba4c690613d734843db218aeedce2f0e5937f (diff) | |
| download | cpython-8267ea2e84d355f00654dec3ad782fc7b1f680f1.zip cpython-8267ea2e84d355f00654dec3ad782fc7b1f680f1.tar.gz cpython-8267ea2e84d355f00654dec3ad782fc7b1f680f1.tar.bz2 | |
bpo-32458: Further tune start_tls tests (#7166)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_asyncio/test_sslproto.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py index 932487a..1b2f9d2 100644 --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -293,7 +293,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin): 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( asyncio.wait_for(client(srv.addr), loop=self.loop, timeout=10)) @@ -358,7 +358,7 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin): 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( asyncio.wait_for(client(srv.addr), loop=self.loop, timeout=self.TIMEOUT)) @@ -412,7 +412,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin): new_tr = await self.loop.start_tls( tr, proto, server_context, - server_side=True) + server_side=True, + ssl_handshake_timeout=self.TIMEOUT) await on_eof await on_con_lost @@ -429,7 +430,8 @@ class BaseStartTLS(func_tests.FunctionalTestCaseMixin): lambda: proto, '127.0.0.1', 0) 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( main(proto, on_con, on_eof, on_con_lost), loop=self.loop, timeout=self.TIMEOUT) |