[Python-checkins] gh-90978: asyncio TestSSL uses SHORT_TIMEOUT (GH-92642)
miss-islington
webhook-mailer at python.org
Wed May 11 17:56:17 EDT 2022
https://github.com/python/cpython/commit/64593f2fedfe41c17e2bad6f207d7a07cfa762b9
commit: 64593f2fedfe41c17e2bad6f207d7a07cfa762b9
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-05-11T14:56:07-07:00
summary:
gh-90978: asyncio TestSSL uses SHORT_TIMEOUT (GH-92642)
TestSSL of asyncio now uses support.SHORT_TIMEOUT rather than
hardcoded timeouts like 5, 10 or 40 seconds.
(cherry picked from commit 1d1929fcb55f8fa9317c19ed4789e1dd6c435092)
Co-authored-by: Victor Stinner <vstinner at python.org>
files:
M Lib/test/test_asyncio/test_ssl.py
diff --git a/Lib/test/test_asyncio/test_ssl.py b/Lib/test/test_asyncio/test_ssl.py
index 9ba6ba04b32b8..5e3c1573c9c58 100644
--- a/Lib/test/test_asyncio/test_ssl.py
+++ b/Lib/test/test_asyncio/test_ssl.py
@@ -82,7 +82,7 @@ def tearDown(self):
def tcp_server(self, server_prog, *,
family=socket.AF_INET,
addr=None,
- timeout=5,
+ timeout=support.SHORT_TIMEOUT,
backlog=1,
max_clients=10):
@@ -113,7 +113,7 @@ def tcp_server(self, server_prog, *,
def tcp_client(self, client_prog,
family=socket.AF_INET,
- timeout=10):
+ timeout=support.SHORT_TIMEOUT):
sock = socket.socket(family, socket.SOCK_STREAM)
@@ -238,7 +238,7 @@ def prog(sock):
async def start_server():
extras = {}
- extras = dict(ssl_handshake_timeout=40.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
srv = await asyncio.start_server(
handle_client,
@@ -303,7 +303,7 @@ def server(sock):
async def client(addr):
extras = {}
- extras = dict(ssl_handshake_timeout=40.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
reader, writer = await asyncio.open_connection(
*addr,
@@ -428,7 +428,7 @@ async def client(addr):
*addr,
ssl=client_sslctx,
server_hostname='',
- ssl_handshake_timeout=1.0)
+ ssl_handshake_timeout=support.SHORT_TIMEOUT)
writer.close()
await self.wait_closed(writer)
@@ -590,7 +590,7 @@ def client():
extras = {}
if server_ssl:
- extras = dict(ssl_handshake_timeout=10.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
f = loop.create_task(
loop.connect_accepted_socket(
@@ -718,7 +718,8 @@ async def client(addr):
with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete(
- asyncio.wait_for(client(srv.addr), timeout=10))
+ asyncio.wait_for(client(srv.addr),
+ timeout=support.SHORT_TIMEOUT))
def test_create_connection_memory_leak(self):
HELLO_MSG = b'1' * self.PAYLOAD_SIZE
@@ -776,7 +777,8 @@ async def client(addr):
with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete(
- asyncio.wait_for(client(srv.addr), timeout=10))
+ asyncio.wait_for(client(srv.addr),
+ timeout=support.SHORT_TIMEOUT))
# No garbage is left for SSL client from loop.create_connection, even
# if user stores the SSLTransport in corresponding protocol instance
@@ -936,7 +938,8 @@ async def client(addr):
with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete(
- asyncio.wait_for(client(srv.addr), timeout=10))
+ asyncio.wait_for(client(srv.addr),
+ timeout=support.SHORT_TIMEOUT))
def test_start_tls_server_1(self):
HELLO_MSG = b'1' * self.PAYLOAD_SIZE
@@ -1186,7 +1189,7 @@ def server(sock):
async def client(addr):
extras = {}
- extras = dict(ssl_handshake_timeout=10.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
reader, writer = await asyncio.open_connection(
*addr,
More information about the Python-checkins
mailing list