removing deprecated fixture

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/traefik_service.py

@@ -3,8 +3,6 @@
 # pylint:disable=redefined-outer-name
 
 
-import asyncio
-
 import aiohttp
 import pytest
 import tenacity
@@ -37,7 +35,6 @@ def traefik_endpoints(
 
 @pytest.fixture()
 async def traefik_service(
-    event_loop: asyncio.AbstractEventLoop,
     traefik_endpoints: tuple[URL, URL, URL],
     docker_stack: dict,
 ) -> tuple[URL, URL, URL]:

packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py

@@ -9,7 +9,6 @@
 
 """
 
-
 import asyncio
 import json
 from collections.abc import Awaitable, Callable
@@ -42,16 +41,12 @@ def app(server_routes: web.RouteTableDef) -> web.Application:
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     aiohttp_client: Callable,
     unused_tcp_port_factory: Callable,
     app: web.Application,
 ) -> TestClient:
-
-    return event_loop.run_until_complete(
-        aiohttp_client(app, server_kwargs={"port": unused_tcp_port_factory()})
-    )
+    return await aiohttp_client(app, server_kwargs={"port": unused_tcp_port_factory()})
 
 
 async def test_workflow(

packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py

@@ -30,15 +30,12 @@ def app(server_routes: web.RouteTableDef) -> web.Application:
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     aiohttp_client: Callable,
     unused_tcp_port_factory: Callable,
     app: web.Application,
 ) -> TestClient:
-    return event_loop.run_until_complete(
-        aiohttp_client(app, server_kwargs={"port": unused_tcp_port_factory()})
-    )
+    return await aiohttp_client(app, server_kwargs={"port": unused_tcp_port_factory()})
 
 
 @pytest.fixture

packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py

@@ -9,8 +9,6 @@
 
 """
 
-
-import asyncio
 from collections.abc import Awaitable, Callable
 from functools import wraps
 from typing import Optional
@@ -79,17 +77,13 @@ def app_with_task_context(
 
 
 @pytest.fixture
-def client_with_task_context(
-    event_loop: asyncio.AbstractEventLoop,
+async def client_with_task_context(
     aiohttp_client: Callable,
     unused_tcp_port_factory: Callable,
     app_with_task_context: web.Application,
 ) -> TestClient:
-
-    return event_loop.run_until_complete(
-        aiohttp_client(
-            app_with_task_context, server_kwargs={"port": unused_tcp_port_factory()}
-        )
+    return await aiohttp_client(
+        app_with_task_context, server_kwargs={"port": unused_tcp_port_factory()}
     )
 
 

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

@@ -3,7 +3,6 @@
 # pylint: disable=unused-variable
 
 
-from asyncio import AbstractEventLoop
 from collections.abc import Callable
 from typing import Any
 
@@ -21,8 +20,7 @@
 
 
 @pytest.fixture
-def client(
-    event_loop: AbstractEventLoop,
+async def client(
     aiohttp_client: Callable,
     unused_tcp_port_factory: Callable,
 ) -> TestClient:
@@ -40,9 +38,7 @@ async def monitored_request(request: web.Request) -> web.Response:
 
     setup_monitoring(app, app_name="pytest_app")
 
-    return event_loop.run_until_complete(
-        aiohttp_client(app, server_kwargs={"port": ports[0]})
-    )
+    return await aiohttp_client(app, server_kwargs={"port": ports[0]})
 
 
 def _assert_metrics_contain_entry(

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

@@ -129,8 +129,7 @@ async def raise_success_with_text(_request: web.Request):
 
 
 @pytest.fixture
-def client(
-    event_loop: asyncio.AbstractEventLoop,
+async def client(
     aiohttp_client: Callable,
     monkeypatch: pytest.MonkeyPatch,
 ):
@@ -175,7 +174,7 @@ def client(
     app.middlewares.append(error_middleware_factory(api_version="/v1"))
     app.middlewares.append(envelope_middleware_factory(api_version="/v1"))
 
-    return event_loop.run_until_complete(aiohttp_client(app))
+    return await aiohttp_client(app)
 
 
 @pytest.mark.parametrize(

services/api-server/tests/unit/test_utils_http_calls_capture.py

@@ -4,7 +4,6 @@
 # pylint: disable=too-many-arguments
 
 
-import asyncio
 import re
 from pathlib import Path
 
@@ -17,9 +16,7 @@
 from pytest_simcore.helpers.httpx_calls_capture_models import HttpApiCallCaptureModel
 
 
-async def test_capture_http_call(
-    event_loop: asyncio.AbstractEventLoop, httpbin_base_url: HttpUrl
-):
+async def test_capture_http_call(httpbin_base_url: HttpUrl):
     # CAPTURE
     async with httpx.AsyncClient() as client:
         response: httpx.Response = await client.get(f"{httpbin_base_url}json")
@@ -56,9 +53,7 @@ async def test_capture_http_call(
             assert response.status_code == captured.status_code
 
 
-async def test_capture_http_dynamic_call(
-    event_loop: asyncio.AbstractEventLoop, faker: Faker, httpbin_base_url: str
-):
+async def test_capture_http_dynamic_call(faker: Faker, httpbin_base_url: str):
     # CAPTURE
     async with httpx.AsyncClient() as client:
         sample_uid = faker.uuid4()  # used during test sampling

services/dask-sidecar/tests/unit/test_computational_sidecar_tasks.py

@@ -535,9 +535,8 @@ async def subscribe_and_process(a_mock: mock.AsyncMock):
             _logger.warning("RabbitMQ worker thread did not terminate properly")
 
 
-def test_run_computational_sidecar_real_fct(
+async def test_run_computational_sidecar_real_fct(
     caplog_info_level: pytest.LogCaptureFixture,
-    event_loop: asyncio.AbstractEventLoop,
     app_environment: EnvVarsDict,
     dask_subsystem_mock: dict[str, mock.Mock],
     sleeper_task: ServiceExampleParam,

services/dask-sidecar/tests/unit/test_utils_gpus.py

@@ -3,7 +3,6 @@
 # pylint: disable=redefined-outer-name
 
 
-import asyncio
 from unittest import mock
 
 import aiodocker
@@ -25,7 +24,6 @@ def mock_aiodocker(mocker: MockerFixture) -> mock.MagicMock:
 
 
 def test_num_available_gpus_returns_0_when_container_not_created(
-    event_loop: asyncio.events.AbstractEventLoop,
     app_environment: EnvVarsDict,
     mock_aiodocker: mock.MagicMock,
 ):
@@ -37,7 +35,6 @@ def test_num_available_gpus_returns_0_when_container_not_created(
 
 
 def test_num_available_gpus_returns_0_when_container_throws_exception_on_run(
-    event_loop: asyncio.events.AbstractEventLoop,
     app_environment: EnvVarsDict,
     mock_aiodocker: mock.MagicMock,
 ):
@@ -50,7 +47,6 @@ def test_num_available_gpus_returns_0_when_container_throws_exception_on_run(
 
 
 def test_num_available_gpus_returns_0_when_no_status_code_returned(
-    event_loop: asyncio.events.AbstractEventLoop,
     app_environment: EnvVarsDict,
     mock_aiodocker: mock.MagicMock,
 ):
@@ -61,7 +57,6 @@ def test_num_available_gpus_returns_0_when_no_status_code_returned(
 
 
 def test_num_available_gpus_returns_0_when_bad_status_code_returned(
-    event_loop: asyncio.events.AbstractEventLoop,
     app_environment: EnvVarsDict,
     mock_aiodocker: mock.MagicMock,
 ):
@@ -72,7 +67,6 @@ def test_num_available_gpus_returns_0_when_bad_status_code_returned(
 
 
 def test_num_available_gpus_returns_0_when_container_wait_timesout(
-    event_loop: asyncio.events.AbstractEventLoop,
     app_environment: EnvVarsDict,
     mock_aiodocker: mock.MagicMock,
 ):
@@ -87,7 +81,6 @@ def test_num_available_gpus_returns_0_when_container_wait_timesout(
     [([], 0), (["gpu1"], 1), (["gpu1", "gpu2", "gpu4"], 3)],
 )
 def test_num_available_gpus(
-    event_loop: asyncio.events.AbstractEventLoop,
     app_environment: EnvVarsDict,
     container_logs: list[str],
     expected_num_gpus: int,