pytest-asyncio update

Author: sanderegg

packages/service-library/src/servicelib/aiohttp/incidents.py

@@ -1,4 +1,4 @@
-from collections.abc import Callable
+from collections.abc import Callable, Iterator
 from dataclasses import dataclass, field
 from typing import Any, Generic, TypeVar
 
@@ -27,6 +27,9 @@ def __len__(self) -> int:
         # called also for __bool__
         return len(self._items)
 
+    def __iter__(self) -> Iterator[ItemT]:
+        return iter(self._items)
+
     def clear(self) -> None:
         self._items.clear()
         self._hits = 0
@@ -72,3 +75,9 @@ class BaseIncident:
 @dataclass
 class SlowCallback(BaseIncident):
     delay_secs: float
+
+    def __lt__(self, other: "SlowCallback") -> bool:
+        """Enable sorting by delay_secs (shorter delays are considered 'less than' longer delays)"""
+        if not isinstance(other, SlowCallback):
+            return NotImplemented
+        return self.delay_secs < other.delay_secs

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

@@ -2,6 +2,7 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
+import asyncio
 import json
 from collections.abc import Callable, Iterator
 from typing import Any
@@ -19,7 +20,7 @@
 
 
 @pytest.fixture
-def server(event_loop, aiohttp_server: Callable) -> Iterator[TestServer]:
+def server(aiohttp_server: Callable) -> Iterator[TestServer]:
     async def echo(request):
         got = await request.json()
         return web.json_response(data=got)
@@ -31,7 +32,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 = asyncio.get_event_loop().run_until_complete(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

@@ -10,13 +10,14 @@
 import pytest
 from servicelib.aiohttp import monitor_slow_callbacks
 from servicelib.aiohttp.aiopg_utils import DatabaseError
+from servicelib.aiohttp.incidents import LimitedOrderedStack, SlowCallback
 from tenacity import retry
 from tenacity.stop import stop_after_attempt
 from tenacity.wait import wait_fixed
 
 
-async def slow_task(delay):
-    time.sleep(delay)  # noqa: ASYNC101
+async def slow_sync_sleeper_task(delay):
+    time.sleep(delay)  # noqa: ASYNC251
 
 
 @retry(wait=wait_fixed(1), stop=stop_after_attempt(2))
@@ -25,18 +26,30 @@ async def fails_to_reach_pg_db():
 
 
 @pytest.fixture
-def incidents_manager(event_loop) -> dict:
-    incidents = []
+async def incidents_manager() -> dict:
+    incidents: LimitedOrderedStack[SlowCallback] = LimitedOrderedStack[SlowCallback](
+        max_size=10
+    )
     monitor_slow_callbacks.enable(slow_duration_secs=0.2, incidents=incidents)
 
-    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
+    f1 = asyncio.ensure_future(
+        slow_sync_sleeper_task(0.3), loop=asyncio.get_event_loop()
+    )
+    assert f1
+    f2 = asyncio.ensure_future(
+        slow_sync_sleeper_task(0.3), loop=asyncio.get_event_loop()
+    )
+    assert f2
+    f3 = asyncio.ensure_future(
+        slow_sync_sleeper_task(0.4), loop=asyncio.get_event_loop()
+    )
+    assert f3
 
     incidents_pg = None  # aiopg_utils.monitor_pg_responsiveness.enable()
-    asyncio.ensure_future(fails_to_reach_pg_db(), loop=event_loop)  # noqa: RUF006
+    f4 = asyncio.ensure_future(fails_to_reach_pg_db(), loop=asyncio.get_event_loop())
+    assert f4
 
-    return {"slow_callback": incidents, "posgres_responsive": incidents_pg}
+    return {"slow_callback": incidents, "postgres_responsive": incidents_pg}
 
 
 @pytest.fixture

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

@@ -2,6 +2,7 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
+import asyncio
 import json
 from collections.abc import Callable
 from uuid import UUID
@@ -99,7 +100,7 @@ def create_fake(cls, faker: Faker):
 
 
 @pytest.fixture
-def client(event_loop, aiohttp_client: Callable, faker: Faker) -> TestClient:
+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 asyncio.get_event_loop().run_until_complete(aiohttp_client(app))
 
 
 @pytest.fixture
@@ -219,7 +220,6 @@ async def test_parse_request_with_invalid_path_params(
     body: MyBody,
     headers_params: MyRequestHeadersParams,
 ):
-
     r = await client.get(
         "/projects/invalid-uuid",
         params=query_params.as_params(),
@@ -250,7 +250,6 @@ async def test_parse_request_with_invalid_query_params(
     body: MyBody,
     headers_params: MyRequestHeadersParams,
 ):
-
     r = await client.get(
         f"/projects/{path_params.project_uuid}",
         params={},
@@ -281,7 +280,6 @@ async def test_parse_request_with_invalid_body(
     query_params: MyRequestQueryParams,
     headers_params: MyRequestHeadersParams,
 ):
-
     r = await client.get(
         f"/projects/{path_params.project_uuid}",
         params=query_params.as_params(),
@@ -319,7 +317,6 @@ async def test_parse_request_with_invalid_json_body(
     query_params: MyRequestQueryParams,
     headers_params: MyRequestHeadersParams,
 ):
-
     r = await client.get(
         f"/projects/{path_params.project_uuid}",
         params=query_params.as_params(),
@@ -338,7 +335,6 @@ async def test_parse_request_with_invalid_headers_params(
     body: MyBody,
     headers_params: MyRequestHeadersParams,
 ):
-
     r = await client.get(
         f"/projects/{path_params.project_uuid}",
         params=query_params.as_params(),
@@ -364,7 +360,6 @@ async def test_parse_request_with_invalid_headers_params(
 
 
 def test_parse_request_query_parameters_as_with_order_by_query_models():
-
     OrderQueryModel = create_ordering_query_model_class(
         ordering_fields={"modified", "name"}, default=OrderBy(field="name")
     )

services/web/server/tests/conftest.py

@@ -3,7 +3,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import asyncio
 import json
 import logging
 import random
@@ -479,11 +478,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/users/conftest.py

@@ -23,8 +23,7 @@
 
 
 @pytest.fixture
-def web_server(
-    event_loop: asyncio.AbstractEventLoop,
+async def web_server(
     app_environment: EnvVarsDict,  # configs
     postgres_db: sa.engine.Engine,  # db-ready
     webserver_test_server_port: int,
@@ -37,7 +36,7 @@ def web_server(
     setup_settings(app)
     setup_db(app)
 
-    return event_loop.run_until_complete(
+    return asyncio.get_running_loop().run_until_complete(
         aiohttp_server(app, port=webserver_test_server_port)
     )