diff options
| author | Victor Stinner <vstinner@python.org> | 2022-05-11 21:25:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-11 21:25:56 (GMT) |
| commit | 1d1929fcb55f8fa9317c19ed4789e1dd6c435092 (patch) | |
| tree | f884fb913e846254ae57136a28a9b169d1f41e2d /Lib/test/test_asyncio/test_ssl.py | |
| parent | 897f14d38d1b455668f9f7ce87892f5efcaf8932 (diff) | |
| download | cpython-1d1929fcb55f8fa9317c19ed4789e1dd6c435092.zip cpython-1d1929fcb55f8fa9317c19ed4789e1dd6c435092.tar.gz cpython-1d1929fcb55f8fa9317c19ed4789e1dd6c435092.tar.bz2 | |
gh-90978: asyncio TestSSL uses SHORT_TIMEOUT (#92642)
TestSSL of asyncio now uses support.SHORT_TIMEOUT rather than
hardcoded timeouts like 5, 10 or 40 seconds.
Diffstat (limited to 'Lib/test/test_asyncio/test_ssl.py')
| -rw-r--r-- | Lib/test/test_asyncio/test_ssl.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/Lib/test/test_asyncio/test_ssl.py b/Lib/test/test_asyncio/test_ssl.py index 9ba6ba0..5e3c157 100644 --- a/Lib/test/test_asyncio/test_ssl.py +++ b/Lib/test/test_asyncio/test_ssl.py @@ -82,7 +82,7 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): *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 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): 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 @@ class TestSSL(test_utils.TestCase): 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, |