mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gh-142489: Increase ssl_handshake_timeout in asyncio tests (#142523)

Browse source 
Replace SHORT_TIMEOUT with LONG_TIMEOUT for very slow CIs.
And add the HANDSHAKE_TIMEOUT constant.
This commit is contained in:
Victor Stinner 2025-12-10 23:21:03 +01:00 • committed by GitHub
parent 97e19014dd
commit dc3ece2bc0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Lib/test/test_asyncio/test_ssl.py
View file

@ -27,6 +27,7 @@ from test.test_asyncio import utils as test_utils
MACOS = (sys.platform == 'darwin')
BUF_MULTIPLIER = 1024 if not MACOS else 64
HANDSHAKE_TIMEOUT = support.LONG_TIMEOUT
def tearDownModule():
@ -257,15 +258,12 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
*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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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 @@ class TestSSL(test_utils.TestCase):
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')