upgrades pytest_asyncio using https://pytest-asyncio.readthedocs.io/en/stable/how-to-guides/migrate_from_0_23.html

Author: pcrespov

packages/service-library/tests/aiohttp/test_client_session.py

@@ -6,7 +6,7 @@
 from collections.abc import Callable, Iterator
 from typing import Any
 
-import pytest
+import pytest_asyncio
 from aiohttp import web
 from aiohttp.client import ClientSession
 from aiohttp.test_utils import TestServer
@@ -18,8 +18,8 @@
 )
 
 
-@pytest.fixture
-def server(event_loop, aiohttp_server: Callable) -> Iterator[TestServer]:
+@pytest_asyncio.fixture(loop_scope="function", scope="function")
+async def server(aiohttp_server: Callable) -> Iterator[TestServer]:
     async def echo(request):
         got = await request.json()
         return web.json_response(data=got)
@@ -31,7 +31,7 @@ async def echo(request):
 
     assert not app.get(APP_CLIENT_SESSION_KEY)
 
-    test_server = event_loop.run_until_complete(aiohttp_server(app))
+    test_server = await aiohttp_server(app)
 
     assert isinstance(app[APP_CLIENT_SESSION_KEY], ClientSession)
     assert not app[APP_CLIENT_SESSION_KEY].closed

packages/service-library/tests/aiohttp/test_monitor_slow_callbacks.py

@@ -8,6 +8,7 @@
 from collections.abc import Iterable
 
 import pytest
+import pytest_asyncio
 from servicelib.aiohttp import monitor_slow_callbacks
 from servicelib.aiohttp.aiopg_utils import DatabaseError
 from tenacity import retry
@@ -24,11 +25,12 @@ async def fails_to_reach_pg_db():
     raise DatabaseError
 
 
-@pytest.fixture
-def incidents_manager(event_loop) -> dict:
+@pytest_asyncio.fixture(loop_scope="function", scope="function")
+async def incidents_manager() -> dict:
     incidents = []
     monitor_slow_callbacks.enable(slow_duration_secs=0.2, incidents=incidents)
 
+    event_loop = asyncio.get_running_loop()
     asyncio.ensure_future(slow_task(0.3), loop=event_loop)  # noqa: RUF006
     asyncio.ensure_future(slow_task(0.3), loop=event_loop)  # noqa: RUF006
     asyncio.ensure_future(slow_task(0.4), loop=event_loop)  # noqa: RUF006

packages/service-library/tests/aiohttp/test_requests_validation.py

@@ -7,6 +7,7 @@
 from uuid import UUID
 
 import pytest
+import pytest_asyncio
 from aiohttp import web
 from aiohttp.test_utils import TestClient, make_mocked_request
 from common_library.json_serialization import json_dumps
@@ -98,8 +99,8 @@ def create_fake(cls, faker: Faker):
         return cls(x=faker.pyint(), y=faker.pybool(), z=Sub.create_fake(faker))
 
 
-@pytest.fixture
-def client(event_loop, aiohttp_client: Callable, faker: Faker) -> TestClient:
+@pytest_asyncio.fixture(loop_scope="function", scope="function")
+async def client(aiohttp_client: Callable, faker: Faker) -> TestClient:
     """
     Some app that:
 
@@ -162,7 +163,7 @@ async def _middleware(request: web.Request, handler):
     # adds handler
     app.add_routes([web.get("/projects/{project_uuid}", _handler)])
 
-    return event_loop.run_until_complete(aiohttp_client(app))
+    return await aiohttp_client(app)
 
 
 @pytest.fixture

services/web/server/tests/conftest.py

@@ -3,7 +3,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import asyncio
 import contextlib
 import json
 import logging
@@ -488,11 +487,3 @@ def mock_dynamic_scheduler(mocker: MockerFixture) -> None:
         "simcore_service_webserver.dynamic_scheduler.api.update_projects_networks",
         autospec=True,
     )
-
-
-@pytest.fixture
-async def loop(
-    event_loop: asyncio.AbstractEventLoop,
-) -> asyncio.AbstractEventLoop:
-    """Override the event loop inside pytest-aiohttp with the one from pytest-asyncio."""
-    return event_loop

services/web/server/tests/unit/with_dbs/03/test_login_auth_app.py

@@ -37,7 +37,7 @@ async def auth_app(
     return app
 
 
-@pytest_asyncio.fixture(loop_scope="function")
+@pytest_asyncio.fixture(loop_scope="function", scope="function")
 async def web_server(
     postgres_db: sa.engine.Engine,
     auth_app: web.Application,

services/web/server/tests/unit/with_dbs/03/users/conftest.py

@@ -3,11 +3,11 @@
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
 
-import asyncio
 from collections.abc import AsyncGenerator, AsyncIterable, Callable
 from typing import Any
 
 import pytest
+import pytest_asyncio
 import sqlalchemy as sa
 from aiohttp import web
 from aiohttp.test_utils import TestServer
@@ -22,9 +22,8 @@
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 
-@pytest.fixture
-def web_server(
-    event_loop: asyncio.AbstractEventLoop,
+@pytest_asyncio.fixture(loop_scope="function", scope="function")
+async def web_server(
     app_environment: EnvVarsDict,  # configs
     postgres_db: sa.engine.Engine,  # db-ready
     webserver_test_server_port: int,
@@ -37,9 +36,7 @@ def web_server(
     setup_settings(app)
     setup_db(app)
 
-    return event_loop.run_until_complete(
-        aiohttp_server(app, port=webserver_test_server_port)
-    )
+    return await aiohttp_server(app, port=webserver_test_server_port)
 
 
 @pytest.fixture

services/web/server/tests/unit/with_dbs/conftest.py

@@ -205,7 +205,7 @@ async def _print_mail_to_stdout(
     )
 
 
-@pytest_asyncio.fixture(loop_scope="function")
+@pytest_asyncio.fixture(loop_scope="function", scope="function")
 async def web_server(
     app_environment: EnvVarsDict,
     postgres_db: sa.engine.Engine,