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

1st1 · web-flow · commit 8267ea2e84d3 · 2018-05-28T15:48:59.000-04:00
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
@@ -293,7 +293,7 @@ async def client(addr):
 
             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 @@ async def client(addr):
 
             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 @@ async def main(proto, on_con, on_eof, on_con_lost):
 
             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 @@ async def run_main():
                 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)
