Merge branch 'master' into drop-pytest-plugin

Author: Dreamsorcerer

docs/testing.rst

@@ -517,6 +517,12 @@ basis, the TestClient object can be used directly::
 A full list of the utilities provided can be found at the
 :data:`api reference <aiohttp.test_utils>`
 
+For end-to-end client code that talks to an external service, it is
+recommended to run a small fake server rather than patching private aiohttp
+internals. The ``examples/fake_server.py`` demo shows such an approach: start
+a local :class:`~aiohttp.web.Application`, point a custom resolver at it, and
+exercise the client against that controlled endpoint.
+
 
 Testing API Reference
 ---------------------

requirements/constraints.txt

@@ -74,7 +74,7 @@ exceptiongroup==1.3.1
     # via pytest
 execnet==2.1.2
     # via pytest-xdist
-filelock==3.28.0
+filelock==3.29.0
     # via
     #   python-discovery
     #   virtualenv
@@ -91,7 +91,7 @@ frozenlist==1.8.0
     #   aiosignal
 gunicorn==25.3.0
     # via -r requirements/base.in
-identify==2.6.18
+identify==2.6.19
     # via pre-commit
 idna==3.11
     # via

requirements/dev.txt

@@ -72,7 +72,7 @@ exceptiongroup==1.3.1
     # via pytest
 execnet==2.1.2
     # via pytest-xdist
-filelock==3.28.0
+filelock==3.29.0
     # via
     #   python-discovery
     #   virtualenv
@@ -89,7 +89,7 @@ frozenlist==1.8.0
     #   aiosignal
 gunicorn==25.3.0
     # via -r requirements/base.in
-identify==2.6.18
+identify==2.6.19
     # via pre-commit
 idna==3.11
     # via

requirements/lint.txt

@@ -35,15 +35,15 @@ distlib==0.4.0
     # via virtualenv
 exceptiongroup==1.3.1
     # via pytest
-filelock==3.28.0
+filelock==3.29.0
     # via
     #   python-discovery
     #   virtualenv
 forbiddenfruit==0.1.4
     # via blockbuster
 freezegun==1.5.5
     # via -r requirements/lint.in
-identify==2.6.18
+identify==2.6.19
     # via pre-commit
 idna==3.11
     # via trustme

tests/test_client_proto.py

@@ -13,19 +13,19 @@
 from aiohttp.http_parser import HttpParser, RawResponseMessage
 
 
-def test_force_close(event_loop: asyncio.AbstractEventLoop) -> None:
+async def test_force_close() -> None:
     """Ensure that the force_close method sets the should_close attribute to True.
 
     This is used externally in aiodocker
     https://github.com/aio-libs/aiodocker/issues/920
     """
-    proto = ResponseHandler(loop=event_loop)
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto.force_close()
     assert proto.should_close
 
 
-def test_oserror(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_oserror() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     transport = mock.Mock()
     proto.connection_made(transport)
     proto.connection_lost(OSError())
@@ -34,9 +34,9 @@ def test_oserror(event_loop: asyncio.AbstractEventLoop) -> None:
     assert isinstance(proto.exception(), ClientOSError)
 
 
-async def test_pause_resume_on_error(event_loop: asyncio.AbstractEventLoop) -> None:
+async def test_pause_resume_on_error() -> None:
     parser = mock.create_autospec(HttpParser, spec_set=True, instance=True)
-    proto = ResponseHandler(loop=event_loop)
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto._parser = parser
     transport = mock.Mock()
     proto.connection_made(transport)
@@ -48,8 +48,8 @@ async def test_pause_resume_on_error(event_loop: asyncio.AbstractEventLoop) -> N
     assert not proto._reading_paused
 
 
-def test_client_proto_bad_message(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_client_proto_bad_message() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     transport = mock.Mock()
     proto.connection_made(transport)
     proto.set_response_params()
@@ -60,8 +60,8 @@ def test_client_proto_bad_message(event_loop: asyncio.AbstractEventLoop) -> None
     assert isinstance(proto.exception(), http.HttpProcessingError)
 
 
-def test_uncompleted_message(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_uncompleted_message() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     transport = mock.Mock()
     proto.connection_made(transport)
     proto.set_response_params(read_until_eof=True)
@@ -78,8 +78,8 @@ def test_uncompleted_message(event_loop: asyncio.AbstractEventLoop) -> None:
     assert dict(exc.message.headers) == {"Location": "http://python.org/"}
 
 
-def test_data_received_after_close(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_data_received_after_close() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     transport = mock.Mock()
     proto.connection_made(transport)
     proto.set_response_params(read_until_eof=True)
@@ -202,32 +202,32 @@ async def test_client_protocol_readuntil_eof() -> None:
     assert response.content.is_eof()
 
 
-def test_empty_data(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_empty_data() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto.data_received(b"")
 
     # do nothing
 
 
-def test_schedule_timeout(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_schedule_timeout() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto.set_response_params(read_timeout=1)
     assert proto._read_timeout_handle is None
     proto.start_timeout()
     assert proto._read_timeout_handle is not None
 
 
-def test_drop_timeout(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_drop_timeout() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto.set_response_params(read_timeout=1)
     proto.start_timeout()
     assert proto._read_timeout_handle is not None
     proto._drop_timeout()
     assert proto._read_timeout_handle is None
 
 
-def test_reschedule_timeout(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_reschedule_timeout() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto.set_response_params(read_timeout=1)
     proto.start_timeout()
     assert proto._read_timeout_handle is not None
@@ -237,23 +237,21 @@ def test_reschedule_timeout(event_loop: asyncio.AbstractEventLoop) -> None:
     assert proto._read_timeout_handle is not h
 
 
-def test_eof_received(event_loop: asyncio.AbstractEventLoop) -> None:
-    proto = ResponseHandler(loop=event_loop)
+async def test_eof_received() -> None:
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto.set_response_params(read_timeout=1)
     proto.start_timeout()
     assert proto._read_timeout_handle is not None
     proto.eof_received()
     assert proto._read_timeout_handle is None
 
 
-def test_connection_lost_sets_transport_to_none(
-    event_loop: asyncio.AbstractEventLoop, mocker: MockerFixture
-) -> None:
+async def test_connection_lost_sets_transport_to_none(mocker: MockerFixture) -> None:
     """Ensure that the transport is set to None when the connection is lost.
 
     This ensures the writer knows that the connection is closed.
     """
-    proto = ResponseHandler(loop=event_loop)
+    proto = ResponseHandler(loop=asyncio.get_running_loop())
     proto.connection_made(mocker.Mock())
     assert proto.transport is not None