https://github.com/python/cpython/commit/dc3ece2bc06d56c21ef81f86424b4598880ba1c8
commit: dc3ece2bc06d56c21ef81f86424b4598880ba1c8
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2025-12-10T22:21:03Z
summary:
gh-142489: Increase ssl_handshake_timeout in asyncio tests (#142523)
Replace SHORT_TIMEOUT with LONG_TIMEOUT for very slow CIs.
And add the HANDSHAKE_TIMEOUT constant.
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 06118f3a61587b..ca15fc3bdd42dd 100644
--- a/Lib/test/test_asyncio/test_ssl.py
+++ b/Lib/test/test_asyncio/test_ssl.py
@@ -27,6 +27,7 @@
MACOS = (sys.platform == 'darwin')
BUF_MULTIPLIER = 1024 if not MACOS else 64
+HANDSHAKE_TIMEOUT = support.LONG_TIMEOUT
def tearDownModule():
@@ -257,15 +258,12 @@ def prog(sock):
await fut
async def start_server():
- extras = {}
- extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
-
srv = await asyncio.start_server(
handle_client,
'127.0.0.1', 0,
family=socket.AF_INET,
ssl=sslctx,
- **extras)
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
try:
srv_socks = srv.sockets
@@ -322,14 +320,11 @@ def server(sock):
sock.close()
async def client(addr):
- extras = {}
- extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
-
reader, writer = await asyncio.open_connection(
*addr,
ssl=client_sslctx,
server_hostname='',
- **extras)
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
writer.write(A_DATA)
self.assertEqual(await reader.readexactly(2), b'OK')
@@ -349,7 +344,8 @@ async def client_sock(addr):
reader, writer = await asyncio.open_connection(
sock=sock,
ssl=client_sslctx,
- server_hostname='')
+ server_hostname='',
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
writer.write(A_DATA)
self.assertEqual(await reader.readexactly(2), b'OK')
@@ -448,7 +444,7 @@ async def client(addr):
*addr,
ssl=client_sslctx,
server_hostname='',
- ssl_handshake_timeout=support.SHORT_TIMEOUT)
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
writer.close()
await self.wait_closed(writer)
@@ -610,7 +606,7 @@ def client():
extras = {}
if server_ssl:
- extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
+ extras = dict(ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
f = loop.create_task(
loop.connect_accepted_socket(
@@ -659,7 +655,8 @@ async def client(addr):
reader, writer = await asyncio.open_connection(
*addr,
ssl=client_sslctx,
- server_hostname='')
+ server_hostname='',
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
self.assertEqual(await reader.readline(), b'A\n')
writer.write(b'B')
@@ -1152,14 +1149,11 @@ def do(func, *args):
await fut
async def start_server():
- extras = {}
-
srv = await self.loop.create_server(
server_protocol_factory,
'127.0.0.1', 0,
family=socket.AF_INET,
- ssl=sslctx_1,
- **extras)
+ ssl=sslctx_1)
try:
srv_socks = srv.sockets
@@ -1209,14 +1203,11 @@ def server(sock):
sock.close()
async def client(addr):
- extras = {}
- extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
-
reader, writer = await asyncio.open_connection(
*addr,
ssl=client_sslctx,
server_hostname='',
- **extras)
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
writer.write(A_DATA)
self.assertEqual(await reader.readexactly(2), b'OK')
@@ -1286,7 +1277,8 @@ async def client(addr):
reader, writer = await asyncio.open_connection(
*addr,
ssl=client_sslctx,
- server_hostname='')
+ server_hostname='',
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
sslprotocol = writer.transport._ssl_protocol
writer.write(b'ping')
data = await reader.readexactly(4)
@@ -1398,7 +1390,8 @@ async def client(addr):
reader, writer = await asyncio.open_connection(
*addr,
ssl=client_sslctx,
- server_hostname='')
+ server_hostname='',
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
writer.write(b'ping')
data = await reader.readexactly(4)
self.assertEqual(data, b'pong')
@@ -1529,7 +1522,8 @@ async def client(addr):
reader, writer = await asyncio.open_connection(
*addr,
ssl=client_sslctx,
- server_hostname='')
+ server_hostname='',
+ ssl_handshake_timeout=HANDSHAKE_TIMEOUT)
writer.write(b'ping')
data = await reader.readexactly(4)
self.assertEqual(data, b'pong')
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
