Fix client timeouts in tests

aio-libs · Nov 20, 2021 · e898151 · e898151
1 parent 597917e
commit e898151
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/aiohttp/client.py b/aiohttp/client.py
@@ -211,7 +211,7 @@ def __init__(
         raise_for_status: Union[
             bool, Callable[[ClientResponse], Awaitable[None]]
         ] = False,
-        timeout: Union[_SENTINEL, ClientTimeout] = sentinel,
+        timeout: Union[_SENTINEL, ClientTimeout, None] = sentinel,
         auto_decompress: bool = True,
         trust_env: bool = False,
         requote_redirect_url: bool = True,
@@ -256,7 +256,7 @@ def __init__(
         self._default_auth = auth
         self._version = version
         self._json_serialize = json_serialize
-        if timeout is sentinel:
+        if timeout is sentinel or timeout is None:
             self._timeout = DEFAULT_TIMEOUT
         else:
             self._timeout = timeout  # type: ignore[assignment]
@@ -345,7 +345,7 @@ async def _request(
         read_until_eof: bool = True,
         proxy: Optional[StrOrURL] = None,
         proxy_auth: Optional[BasicAuth] = None,
-        timeout: Union[ClientTimeout, _SENTINEL] = sentinel,
+        timeout: Union[ClientTimeout, _SENTINEL, None] = sentinel,
         ssl: Optional[Union[SSLContext, bool, Fingerprint]] = None,
         proxy_headers: Optional[LooseHeaders] = None,
         trace_request_ctx: Optional[SimpleNamespace] = None,
@@ -396,8 +396,8 @@ async def _request(
             except ValueError as e:
                 raise InvalidURL(proxy) from e
 
-        if timeout is sentinel:
-            real_timeout = self._timeout  # type: ClientTimeout
+        if timeout is sentinel or timeout is None:
+            real_timeout: ClientTimeout = self._timeout
         else:
             real_timeout = timeout  # type: ignore[assignment]
         # timeout is cumulative for all request operations
@@ -646,7 +646,7 @@ def ws_connect(
         *,
         method: str = hdrs.METH_GET,
         protocols: Iterable[str] = (),
-        timeout: Union[ClientWSTimeout, float, _SENTINEL] = sentinel,
+        timeout: Union[ClientWSTimeout, float, _SENTINEL, None] = sentinel,
         receive_timeout: Optional[float] = None,
         autoclose: bool = True,
         autoping: bool = True,
@@ -692,7 +692,7 @@ async def _ws_connect(
         *,
         method: str = hdrs.METH_GET,
         protocols: Iterable[str] = (),
-        timeout: Union[ClientWSTimeout, float, _SENTINEL] = sentinel,
+        timeout: Union[ClientWSTimeout, float, _SENTINEL, None] = sentinel,
         receive_timeout: Optional[float] = None,
         autoclose: bool = True,
         autoping: bool = True,
@@ -708,7 +708,9 @@ async def _ws_connect(
         compress: int = 0,
         max_msg_size: int = 4 * 1024 * 1024,
     ) -> ClientWebSocketResponse:
-        if timeout is not sentinel:
+        if timeout is sentinel or timeout is None:
+            ws_timeout = DEFAULT_WS_CLIENT_TIMEOUT
+        else:
             if isinstance(timeout, ClientWSTimeout):
                 ws_timeout = timeout
             else:
@@ -720,8 +722,6 @@ async def _ws_connect(
                     stacklevel=2,
                 )
                 ws_timeout = ClientWSTimeout(ws_close=timeout)  # type: ignore[arg-type]
-        else:
-            ws_timeout = DEFAULT_WS_CLIENT_TIMEOUT
         if receive_timeout is not None:
             warnings.warn(
                 "float parameter 'receive_timeout' "

diff --git a/tests/test_client_functional.py b/tests/test_client_functional.py
@@ -580,7 +580,7 @@ async def handler(request):
     client = await aiohttp_client(app)
 
     with pytest.raises(asyncio.TimeoutError):
-        await client.get("/", timeout=0.01)
+        await client.get("/", timeout=aiohttp.ClientTimeout(total=0.01))
 
 
 async def test_timeout_on_conn_reading_headers(
@@ -601,7 +601,7 @@ async def handler(request):
     client = await aiohttp_client(app, connector=conn)
 
     with pytest.raises(asyncio.TimeoutError):
-        await client.get("/", timeout=0.01)
+        await client.get("/", timeout=aiohttp.ClientTimeout(total=0.01))
 
 
 async def test_timeout_on_session_read_timeout(
@@ -687,7 +687,7 @@ async def handler(request):
     app.router.add_route("GET", "/", handler)
     client = await aiohttp_client(app)
 
-    resp = await client.get("/", timeout=1)
+    resp = await client.get("/", timeout=aiohttp.ClientTimeout(1))
     await fut
 
     with pytest.raises(asyncio.TimeoutError):

diff --git a/tests/test_web_websocket_functional.py b/tests/test_web_websocket_functional.py
@@ -809,6 +809,6 @@ async def ws_handler(request):
     with pytest.raises(WSServerHandshakeError):
         await client.ws_connect("/ws")
 
-    resp = await client.get("/api/null", timeout=1)
+    resp = await client.get("/api/null", timeout=aiohttp.ClientTimeout(total=1))
     assert (await resp.json()) == {"err": None}
     resp.close()