renamed fixtures

Author: Andrei Neagu

services/dynamic-sidecar/tests/unit/test_api_rest_prometheus_metrics.py

@@ -101,7 +101,7 @@ async def httpx_async_client(
 
 
 @pytest.fixture
-def client(
+def http_client(
     app: FastAPI, httpx_async_client: AsyncClient, backend_url: AnyHttpUrl
 ) -> HttpClient:
     return HttpClient(
@@ -162,7 +162,7 @@ async def test_metrics_enabled_containers_will_start(
     enable_prometheus_metrics: None,
     app: FastAPI,
     httpx_async_client: AsyncClient,
-    client: HttpClient,
+    http_client: HttpClient,
     compose_spec: str,
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
 ):
@@ -172,7 +172,7 @@ async def test_metrics_enabled_containers_will_start(
     assert _USER_SERVICES_NOT_STARTED in response.text
 
     async with periodic_task_result(
-        client=client,
+        client=http_client,
         task_id=await _get_task_id_create_service_containers(
             httpx_async_client, compose_spec, mock_metrics_params
         ),

services/dynamic-sidecar/tests/unit/test_api_rest_workflow_service_metrics.py

@@ -141,7 +141,7 @@ async def httpx_async_client(
 
 
 @pytest.fixture
-async def client(
+async def http_client(
     app: FastAPI, httpx_async_client: AsyncClient, backend_url: AnyHttpUrl
 ) -> HttpClient:
     return HttpClient(
@@ -234,13 +234,13 @@ async def test_service_starts_and_closes_as_expected(
     mock_post_rabbit_message: AsyncMock,
     app: FastAPI,
     httpx_async_client: AsyncClient,
-    client: HttpClient,
+    http_client: HttpClient,
     compose_spec: str,
     container_names: list[str],
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
 ):
     async with periodic_task_result(
-        client=client,
+        client=http_client,
         task_id=await _get_task_id_create_service_containers(
             httpx_async_client, compose_spec, mock_metrics_params
         ),
@@ -253,7 +253,7 @@ async def test_service_starts_and_closes_as_expected(
     await _wait_for_containers_to_be_running(app)
 
     async with periodic_task_result(
-        client=client,
+        client=http_client,
         task_id=await _get_task_id_docker_compose_down(httpx_async_client),
         task_timeout=_CREATE_SERVICE_CONTAINERS_TIMEOUT,
         status_poll_interval=_FAST_STATUS_POLL,
@@ -287,15 +287,15 @@ async def test_user_services_fail_to_start(
     mock_post_rabbit_message: AsyncMock,
     app: FastAPI,
     httpx_async_client: AsyncClient,
-    client: HttpClient,
+    http_client: HttpClient,
     compose_spec: str,
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
     with_compose_down: bool,
     mock_user_services_fail_to_start: None,
 ):
     with pytest.raises(TaskExceptionError):
         async with periodic_task_result(
-            client=client,
+            client=http_client,
             task_id=await _get_task_id_create_service_containers(
                 httpx_async_client, compose_spec, mock_metrics_params
             ),
@@ -308,7 +308,7 @@ async def test_user_services_fail_to_start(
 
     if with_compose_down:
         async with periodic_task_result(
-            client=client,
+            client=http_client,
             task_id=await _get_task_id_docker_compose_down(httpx_async_client),
             task_timeout=_CREATE_SERVICE_CONTAINERS_TIMEOUT,
             status_poll_interval=_FAST_STATUS_POLL,
@@ -326,14 +326,14 @@ async def test_user_services_fail_to_stop_or_save_data(
     mock_post_rabbit_message: AsyncMock,
     app: FastAPI,
     httpx_async_client: AsyncClient,
-    client: HttpClient,
+    http_client: HttpClient,
     compose_spec: str,
     container_names: list[str],
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
     mock_user_services_fail_to_stop: None,
 ):
     async with periodic_task_result(
-        client=client,
+        client=http_client,
         task_id=await _get_task_id_create_service_containers(
             httpx_async_client, compose_spec, mock_metrics_params
         ),
@@ -353,7 +353,7 @@ async def test_user_services_fail_to_stop_or_save_data(
     for _ in range(_EXPECTED_STOP_MESSAGES):
         with pytest.raises(TaskExceptionError):
             async with periodic_task_result(
-                client=client,
+                client=http_client,
                 task_id=await _get_task_id_docker_compose_down(httpx_async_client),
                 task_timeout=_CREATE_SERVICE_CONTAINERS_TIMEOUT,
                 status_poll_interval=_FAST_STATUS_POLL,
@@ -423,15 +423,15 @@ async def test_user_services_crash_when_running(
     mock_post_rabbit_message: AsyncMock,
     app: FastAPI,
     httpx_async_client: AsyncClient,
-    client: HttpClient,
+    http_client: HttpClient,
     compose_spec: str,
     container_names: list[str],
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
     mock_one_container_oom_killed: Callable[[], None],
     expected_platform_state: SimcorePlatformStatus,
 ):
     async with periodic_task_result(
-        client=client,
+        client=http_client,
         task_id=await _get_task_id_create_service_containers(
             httpx_async_client, compose_spec, mock_metrics_params
         ),
@@ -483,7 +483,7 @@ async def test_user_services_crash_when_running(
     _EXPECTED_STOP_MESSAGES = 4
     for _ in range(_EXPECTED_STOP_MESSAGES):
         async with periodic_task_result(
-            client=client,
+            client=http_client,
             task_id=await _get_task_id_docker_compose_down(httpx_async_client),
             task_timeout=_CREATE_SERVICE_CONTAINERS_TIMEOUT,
             status_poll_interval=_FAST_STATUS_POLL,