trying to fix pytest-asyncio

Author: sanderegg

services/web/server/setup.cfg

@@ -12,13 +12,14 @@ commit_args = --no-verify
 [tool:pytest]
 addopts = --strict-markers
 asyncio_mode = auto
-markers = 
+markers =
 	slow: marks tests as slow (deselect with '-m "not slow"')
 	acceptance_test: "marks tests as 'acceptance tests' i.e. does the system do what the user expects? Typically those are workflows."
 	testit: "marks test to run during development"
 	heavy_load: "mark tests that require large amount of data"
+asyncio_default_fixture_loop_scope = function
 
 [mypy]
-plugins = 
+plugins =
 	pydantic.mypy
 	sqlalchemy.ext.mypy.plugin

services/web/server/tests/integration/01/test_exporter_requests_handlers.py

@@ -1,7 +1,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=redefined-outer-name
 
-import asyncio
 import logging
 import sys
 from collections.abc import AsyncIterable, Callable, Iterable
@@ -145,9 +144,8 @@ def product_name() -> str:
 
 
 @pytest.fixture
-def client(
+async def client(
     docker_swarm: None,
-    event_loop: asyncio.AbstractEventLoop,
     aiohttp_client: Callable,
     app_config: dict,
     monkeypatch_setenv_from_app_config: Callable,
@@ -185,11 +183,9 @@ def client(
     setup_socketio(app)
     setup_resource_manager(app)
 
-    return event_loop.run_until_complete(
-        aiohttp_client(
-            app,
-            server_kwargs={"port": cfg["main"]["port"], "host": cfg["main"]["host"]},
-        )
+    return await aiohttp_client(
+        app,
+        server_kwargs={"port": cfg["main"]["port"], "host": cfg["main"]["host"]},
     )
 
 

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -139,8 +139,7 @@ async def director_v2_service_mock(
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     aiohttp_client: Callable[..., Awaitable[TestClient]],
     app_config: dict[str, Any],
     postgres_with_template_db: sa.engine.Engine,
@@ -181,11 +180,9 @@ def client(
     assert setup_resource_manager(app)
     setup_garbage_collector(app)
 
-    return event_loop.run_until_complete(
-        aiohttp_client(
-            app,
-            server_kwargs={"port": cfg["main"]["port"], "host": cfg["main"]["host"]},
-        )
+    return await aiohttp_client(
+        app,
+        server_kwargs={"port": cfg["main"]["port"], "host": cfg["main"]["host"]},
     )
 
 

services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py

@@ -3,7 +3,6 @@
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
 
-import asyncio
 from collections.abc import Awaitable, Callable
 from random import choice
 from typing import Any
@@ -130,9 +129,8 @@ async def _assert_handler_called_with_json(
 
 
 @pytest.fixture
-def client(
+async def client(
     mock_redis_socket_timeout: None,
-    event_loop: asyncio.AbstractEventLoop,
     aiohttp_client: Callable,
     app_config: dict[str, Any],
     rabbit_service: RabbitSettings,
@@ -159,14 +157,12 @@ def client(
     setup_socketio(app)
     setup_resource_manager(app)
 
-    return event_loop.run_until_complete(
-        aiohttp_client(
-            app,
-            server_kwargs={
-                "port": app_config["main"]["port"],
-                "host": app_config["main"]["host"],
-            },
-        )
+    return await aiohttp_client(
+        app,
+        server_kwargs={
+            "port": app_config["main"]["port"],
+            "host": app_config["main"]["host"],
+        },
     )
 
 

services/web/server/tests/integration/02/test_computation.py

@@ -113,8 +113,7 @@ def user_role_response():
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     postgres_db: sa.engine.Engine,
     rabbit_service: RabbitSettings,
     redis_settings: RedisSettings,
@@ -151,14 +150,12 @@ def client(
     setup_db_listener(app)
     # no garbage collector
 
-    return event_loop.run_until_complete(
-        aiohttp_client(
-            app,
-            server_kwargs={
-                "port": app_config["main"]["port"],
-                "host": app_config["main"]["host"],
-            },
-        )
+    return await aiohttp_client(
+        app,
+        server_kwargs={
+            "port": app_config["main"]["port"],
+            "host": app_config["main"]["host"],
+        },
     )
 
 
@@ -253,7 +250,7 @@ def _get_project_workbench_from_db(
         project_in_db
     ), f"missing pipeline in the database under comp_pipeline {project_id}"
     print(
-        f"<-- found following workbench: {json_dumps( project_in_db.workbench, indent=2)}"
+        f"<-- found following workbench: {json_dumps(project_in_db.workbench, indent=2)}"
     )
     return project_in_db.workbench
 

services/web/server/tests/unit/isolated/scicrunch/test_scicrunch_service_client.py

@@ -3,10 +3,10 @@
 # pylint:disable=redefined-outer-name
 
 """
-    Use this test to emulate situations with scicrunch service API
+Use this test to emulate situations with scicrunch service API
 
 """
-import asyncio
+
 import json
 import os
 from collections.abc import Callable
@@ -100,18 +100,16 @@ async def mock_scicrunch_service_resolver(
 
 
 @pytest.fixture
-def app(
+async def app(
     mock_env_devel_environment: EnvVarsDict,
-    event_loop: asyncio.AbstractEventLoop,
     aiohttp_server: Callable,
 ) -> web.Application:
-
     app_ = create_safe_application()
 
     setup_settings(app_)
     setup_scicrunch(app_)
 
-    server = event_loop.run_until_complete(aiohttp_server(app_))
+    server = await aiohttp_server(app_)
     assert server.app == app_
     return server.app
 

services/web/server/tests/unit/isolated/test__redirections.py

@@ -3,7 +3,6 @@
 # pylint:disable=redefined-outer-name
 
 
-import asyncio
 import textwrap
 from collections.abc import Awaitable, Callable
 from pathlib import Path
@@ -36,12 +35,10 @@ def index_static_path(tmpdir):
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     aiohttp_client: Callable[..., Awaitable[TestClient]],
     index_static_path,
 ):
-
     routes = web.RouteTableDef()
 
     @routes.get("/")
@@ -71,7 +68,7 @@ async def get_redirect_to_root(_request):
 
     app = web.Application()
     app.add_routes(routes)
-    return event_loop.run_until_complete(aiohttp_client(app))
+    return await aiohttp_client(app)
 
 
 @pytest.mark.parametrize("test_path", ["/", "/other"])

services/web/server/tests/unit/isolated/test_activity.py

@@ -2,7 +2,6 @@
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 
-import asyncio
 import os
 from collections.abc import Awaitable, Callable
 from typing import Any
@@ -62,7 +61,6 @@ def mocked_monitoring_down(mocker: MockerFixture) -> None:
 def app_environment(
     mock_env_devel_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
 ) -> EnvVarsDict:
-
     envs = mock_env_devel_environment | setenvs_from_dict(
         monkeypatch,
         {
@@ -99,8 +97,7 @@ def app_environment(
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     aiohttp_client: Callable[..., Awaitable[TestClient]],
     mock_orphaned_services: MagicMock,
     app_environment: EnvVarsDict,
@@ -119,7 +116,7 @@ def client(
     setup_rest(app)
     assert setup_activity(app)
 
-    return event_loop.run_until_complete(aiohttp_client(app))
+    return await aiohttp_client(app)
 
 
 async def test_has_login_required(client: TestClient):

services/web/server/tests/unit/isolated/test_catalog_setup.py

@@ -2,7 +2,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import asyncio
 from collections.abc import Awaitable, Callable
 
 import pytest
@@ -15,15 +14,14 @@
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     aiohttp_client: Callable[..., Awaitable[TestClient]],
 ):
     app = create_safe_application()
 
     setup_catalog.__wrapped__(app)
 
-    return event_loop.run_until_complete(aiohttp_client(app))
+    return await aiohttp_client(app)
 
 
 def test_url_translation():

services/web/server/tests/unit/isolated/test_diagnostics_healthcheck.py

@@ -103,14 +103,12 @@ def mock_environment(
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     unused_tcp_port_factory: Callable,
     aiohttp_client: Callable[..., Awaitable[TestClient]],
     api_version_prefix: str,
     mock_environment: EnvVarsDict,
 ) -> TestClient:
-
     routes = web.RouteTableDef()
 
     @routes.get("/error")
@@ -167,8 +165,8 @@ async def delay_response(request: web.Request):
 
     app.router.add_routes(routes)
 
-    return event_loop.run_until_complete(
-        aiohttp_client(app, server_kwargs={key: main[key] for key in ("host", "port")})
+    return await aiohttp_client(
+        app, server_kwargs={key: main[key] for key in ("host", "port")}
     )
 
 
@@ -228,7 +226,7 @@ async def test_diagnose_on_response_delays(client: TestClient):
     settings: DiagnosticsSettings = client.app[APP_SETTINGS_KEY].WEBSERVER_DIAGNOSTICS
 
     tmax = settings.DIAGNOSTICS_MAX_AVG_LATENCY
-    coros = [client.get(f"/delay/{1.1*tmax}") for _ in range(10)]
+    coros = [client.get(f"/delay/{1.1 * tmax}") for _ in range(10)]
     resps = await asyncio.gather(*coros)
 
     for resp in resps: