[pull] master from aio-libs:master

CHANGES/9705.contrib.rst

@@ -0,0 +1,2 @@
+Reduced the runtime of a client timeout regression test by shortening its artificial response delay.
+-- by :user:`nightcityblade`.

CONTRIBUTORS.txt

@@ -286,6 +286,7 @@ Moss Collum
 Mun Gwan-gyeong
 Navid Sheikhol
 Nicolas Braem
+Night Cityblade
 Nikolay Kim
 Nikolay Novik
 Nikolay Tiunov

requirements/constraints.txt

@@ -216,7 +216,7 @@ pytest-aiohttp==1.1.0
     # via
     #   -r requirements/lint.in
     #   -r requirements/test-common.in
-pytest-asyncio==1.4.0a2
+pytest-asyncio==1.4.0
     # via pytest-aiohttp
 pytest-codspeed==5.0.3
     # via

requirements/dev.txt

@@ -211,7 +211,7 @@ pytest-aiohttp==1.1.0
     # via
     #   -r requirements/lint.in
     #   -r requirements/test-common.in
-pytest-asyncio==1.4.0a2
+pytest-asyncio==1.4.0
     # via pytest-aiohttp
 pytest-codspeed==5.0.3
     # via

requirements/lint.txt

@@ -119,7 +119,7 @@ pytest==9.0.3
     #   pytest-mock
 pytest-aiohttp==1.1.0
     # via -r requirements/lint.in
-pytest-asyncio==1.4.0a2
+pytest-asyncio==1.4.0
     # via pytest-aiohttp
 pytest-codspeed==5.0.3
     # via -r requirements/lint.in

requirements/test-common.txt

@@ -104,7 +104,7 @@ pytest==9.0.3
     #   pytest-xdist
 pytest-aiohttp==1.1.0
     # via -r requirements/test-common.in
-pytest-asyncio==1.3.0
+pytest-asyncio==1.4.0
     # via pytest-aiohttp
 pytest-codspeed==5.0.3
     # via -r requirements/test-common.in

requirements/test-ft.txt

@@ -127,7 +127,7 @@ pytest==9.0.3
     #   pytest-xdist
 pytest-aiohttp==1.1.0
     # via -r requirements/test-common.in
-pytest-asyncio==1.4.0a2
+pytest-asyncio==1.4.0
     # via pytest-aiohttp
 pytest-codspeed==5.0.3
     # via -r requirements/test-common.in

requirements/test.txt

@@ -127,7 +127,7 @@ pytest==9.0.3
     #   pytest-xdist
 pytest-aiohttp==1.1.0
     # via -r requirements/test-common.in
-pytest-asyncio==1.4.0a2
+pytest-asyncio==1.4.0
     # via pytest-aiohttp
 pytest-codspeed==5.0.3
     # via -r requirements/test-common.in

tests/test_client_functional.py

@@ -1159,17 +1159,17 @@ async def test_read_timeout_between_chunks(
     async def handler(request: web.Request) -> web.StreamResponse:
         resp = aiohttp.web.StreamResponse()
         await resp.prepare(request)
-        # write data 4 times, with pauses. Total time 2 seconds.
+        # write data 4 times, with pauses. Total time 0.4 seconds.
         for _ in range(4):
-            await asyncio.sleep(0.5)
+            await asyncio.sleep(0.1)
             await resp.write(b"data\n")
         return resp
 
     app = web.Application()
     app.add_routes([web.get("/", handler)])
 
-    # A timeout of 0.2 seconds should apply per read.
-    timeout = aiohttp.ClientTimeout(sock_read=1)
+    # The read timeout should apply per read, not to the whole response.
+    timeout = aiohttp.ClientTimeout(sock_read=0.2)
     client = await aiohttp_client(app, timeout=timeout)
 
     res = b""