Remove pytest_plugin

aiohttp/test_utils.py

@@ -1,8 +1,6 @@
 """Utilities shared by tests."""
 
 import asyncio
-import contextlib
-import gc
 import ipaddress
 import os
 import socket
@@ -15,13 +13,11 @@
     Callable,
     Dict,
     Generic,
-    Iterator,
     List,
     Optional,
     Type,
     TypeVar,
     Union,
-    cast,
     overload,
 )
 from unittest import IsolatedAsyncioTestCase, mock
@@ -77,32 +73,6 @@
 REUSE_ADDRESS = os.name == "posix" and sys.platform != "cygwin"
 
 
-def get_unused_port_socket(
-    host: str, family: socket.AddressFamily = socket.AF_INET
-) -> socket.socket:
-    return get_port_socket(host, 0, family)
-
-
-def get_port_socket(
-    host: str, port: int, family: socket.AddressFamily = socket.AF_INET
-) -> socket.socket:
-    s = socket.socket(family, socket.SOCK_STREAM)
-    if REUSE_ADDRESS:
-        # Windows has different semantics for SO_REUSEADDR,
-        # so don't set it. Ref:
-        # https://docs.microsoft.com/en-us/windows/win32/winsock/using-so-reuseaddr-and-so-exclusiveaddruse
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    s.bind((host, port))
-    return s
-
-
-def unused_port() -> int:
-    """Return a port that is unused on the current host."""
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.bind(("127.0.0.1", 0))
-        return cast(int, s.getsockname()[1])
-
-
 class BaseTestServer(ABC, Generic[_Request]):
     __test__ = False
 
@@ -115,7 +85,9 @@ def __init__(
         skip_url_asserts: bool = False,
         socket_factory: Callable[
             [str, int, socket.AddressFamily], socket.socket
-        ] = get_port_socket,
+        ] = lambda h, p, f: socket.create_server(
+            (h, p), family=f, reuse_port=REUSE_ADDRESS
+        ),
         **kwargs: Any,
     ) -> None:
         self.runner: Optional[BaseRunner[_Request]] = None
@@ -531,49 +503,6 @@ async def get_client(self, server: TestServer) -> TestClient[Request, Applicatio
         return TestClient(server)
 
 
-_LOOP_FACTORY = Callable[[], asyncio.AbstractEventLoop]
-
-
-@contextlib.contextmanager
-def loop_context(
-    loop_factory: _LOOP_FACTORY = asyncio.new_event_loop, fast: bool = False
-) -> Iterator[asyncio.AbstractEventLoop]:
-    """A contextmanager that creates an event_loop, for test purposes.
-
-    Handles the creation and cleanup of a test loop.
-    """
-    loop = setup_test_loop(loop_factory)
-    yield loop
-    teardown_test_loop(loop, fast=fast)
-
-
-def setup_test_loop(
-    loop_factory: _LOOP_FACTORY = asyncio.new_event_loop,
-) -> asyncio.AbstractEventLoop:
-    """Create and return an asyncio.BaseEventLoop instance.
-
-    The caller should also call teardown_test_loop,
-    once they are done with the loop.
-    """
-    loop = loop_factory()
-    asyncio.set_event_loop(loop)
-    return loop
-
-
-def teardown_test_loop(loop: asyncio.AbstractEventLoop, fast: bool = False) -> None:
-    """Teardown and cleanup an event_loop created by setup_test_loop."""
-    closed = loop.is_closed()
-    if not closed:
-        loop.call_soon(loop.stop)
-        loop.run_forever()
-        loop.close()
-
-    if not fast:
-        gc.collect()
-
-    asyncio.set_event_loop(None)
-
-
 def _create_app_mock() -> mock.MagicMock:
     def get_dict(app: Any, key: str) -> Any:
         return app.__app_dict[key]

docs/testing.rst

@@ -26,10 +26,6 @@ For using pytest plugin please install pytest-aiohttp_ library:
 
    $ pip install pytest-aiohttp
 
-If you don't want to install *pytest-aiohttp* for some reason you may
-insert ``pytest_plugins = 'aiohttp.pytest_plugin'`` line into
-``conftest.py`` instead for the same functionality.
-
 
 
 The Test Client and Servers
@@ -206,22 +202,6 @@ Pytest tooling has the following fixtures:
 
    .. versionadded:: 3.0
 
-.. data:: aiohttp_unused_port()
-
-   Function to return an unused port number for IPv4 TCP protocol::
-
-      async def test_f(aiohttp_client, aiohttp_unused_port):
-          port = aiohttp_unused_port()
-          app = web.Application()
-          # fill route table
-
-          client = await aiohttp_client(app, server_kwargs={'port': port})
-          ...
-
-   .. versionchanged:: 3.0
-
-      The fixture was renamed from ``unused_port`` to ``aiohttp_unused_port``.
-
 .. data:: aiohttp_client_cls
 
    A fixture for passing custom :class:`~aiohttp.test_utils.TestClient` implementations::
@@ -555,7 +535,7 @@ Test server usually works in conjunction with
 :class:`aiohttp.test_utils.TestClient` which provides handy client methods
 for accessing to the server.
 
-.. class:: BaseTestServer(*, scheme='http', host='127.0.0.1', port=None, socket_factory=get_port_socket)
+.. class:: BaseTestServer(*, scheme='http', host='127.0.0.1', port=None, socket_factory=...)
 
    Base class for test servers.
 
@@ -790,50 +770,5 @@ Test Client
       The api corresponds to :meth:`aiohttp.ClientSession.ws_connect`.
 
 
-Utilities
-~~~~~~~~~
-
-.. function:: unused_port()
-
-   Return an unused port number for IPv4 TCP protocol.
-
-   :return int: ephemeral port number which could be reused by test server.
-
-.. function:: loop_context(loop_factory=<function asyncio.new_event_loop>)
-
-   A contextmanager that creates an event_loop, for test purposes.
-
-   Handles the creation and cleanup of a test loop.
-
-.. function:: setup_test_loop(loop_factory=<function asyncio.new_event_loop>)
-
-   Create and return an :class:`asyncio.AbstractEventLoop` instance.
-
-   The caller should also call teardown_test_loop, once they are done
-   with the loop.
-
-   .. note::
-
-      As side effect the function changes asyncio *default loop* by
-      :func:`asyncio.set_event_loop` call.
-
-      Previous default loop is not restored.
-
-      It should not be a problem for test suite: every test expects a
-      new test loop instance anyway.
-
-   .. versionchanged:: 3.1
-
-      The function installs a created event loop as *default*.
-
-.. function:: teardown_test_loop(loop)
-
-   Teardown and cleanup an event_loop created by setup_test_loop.
-
-   :param loop: the loop to teardown
-   :type loop: asyncio.AbstractEventLoop
-
-
-
 .. _pytest: http://pytest.org/latest/
 .. _pytest-aiohttp: https://pypi.python.org/pypi/pytest-aiohttp

examples/fake_server.py

@@ -5,7 +5,7 @@
 import ssl
 from typing import Dict, List
 
-from aiohttp import ClientSession, TCPConnector, test_utils, web
+from aiohttp import ClientSession, TCPConnector, web
 from aiohttp.abc import AbstractResolver, ResolveResult
 from aiohttp.resolver import DefaultResolver
 
@@ -60,11 +60,10 @@ def __init__(self) -> None:
         self.ssl_context.load_cert_chain(str(ssl_cert), str(ssl_key))
 
     async def start(self) -> Dict[str, int]:
-        port = test_utils.unused_port()
         await self.runner.setup()
-        site = web.TCPSite(self.runner, "127.0.0.1", port, ssl_context=self.ssl_context)
+        site = web.TCPSite(self.runner, "127.0.0.1", 0, ssl_context=self.ssl_context)
         await site.start()
-        return {"graph.facebook.com": port}
+        return {"graph.facebook.com": self._server.sockets[0].getsockname()[1]}
 
     async def stop(self) -> None:
         await self.runner.cleanup()

requirements/constraints.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile --allow-unsafe --output-file=requirements/constraints.txt --resolver=backtracking --strip-extras requirements/constraints.in
 #
@@ -9,19 +9,28 @@ aiodns==3.5.0
     #   -r requirements/lint.in
     #   -r requirements/runtime-deps.in
 aiohappyeyeballs==2.6.1
-    # via -r requirements/runtime-deps.in
+    # via
+    #   -r requirements/runtime-deps.in
+    #   aiohttp
+aiohttp==3.11.18
+    # via pytest-aiohttp
 aiohttp-theme==0.1.7
     # via -r requirements/doc.in
 aiosignal==1.3.2
-    # via -r requirements/runtime-deps.in
+    # via
+    #   -r requirements/runtime-deps.in
+    #   aiohttp
 alabaster==1.0.0
     # via sphinx
 annotated-types==0.7.0
     # via pydantic
 async-timeout==5.0.1 ; python_version < "3.11"
     # via
     #   -r requirements/runtime-deps.in
+    #   aiohttp
     #   valkey
+attrs==25.3.0
+    # via aiohttp
 babel==2.17.0
     # via sphinx
 blockbuster==1.5.24
@@ -81,6 +90,7 @@ freezegun==1.5.2
 frozenlist==1.7.0
     # via
     #   -r requirements/runtime-deps.in
+    #   aiohttp
     #   aiosignal
 gidgethub==5.4.0
     # via cherry-picker
@@ -117,6 +127,7 @@ multidict==6.5.0
     # via
     #   -r requirements/multidict.in
     #   -r requirements/runtime-deps.in
+    #   aiohttp
     #   yarl
 mypy==1.16.1 ; implementation_name == "cpython"
     # via
@@ -150,6 +161,7 @@ pre-commit==4.2.0
 propcache==0.3.2
     # via
     #   -r requirements/runtime-deps.in
+    #   aiohttp
     #   yarl
 proxy-py==2.4.10
     # via
@@ -182,10 +194,18 @@ pytest==8.4.1
     # via
     #   -r requirements/lint.in
     #   -r requirements/test.in
+    #   pytest-aiohttp
+    #   pytest-asyncio
     #   pytest-codspeed
     #   pytest-cov
     #   pytest-mock
     #   pytest-xdist
+pytest-aiohttp==1.1.0
+    # via
+    #   -r requirements/lint.in
+    #   -r requirements/test.in
+pytest-asyncio==1.0.0
+    # via pytest-aiohttp
 pytest-codspeed==3.2.0
     # via
     #   -r requirements/lint.in
@@ -295,7 +315,9 @@ wait-for-it==2.3.0
 wheel==0.46.0
     # via pip-tools
 yarl==1.20.1
-    # via -r requirements/runtime-deps.in
+    # via
+    #   -r requirements/runtime-deps.in
+    #   aiohttp
 zlib-ng==0.5.1
     # via
     #   -r requirements/lint.in

requirements/cython.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --allow-unsafe --output-file=requirements/cython.txt --resolver=backtracking --strip-extras requirements/cython.in