rename

Author: Andrei Neagu

packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks_context_manager.py

@@ -45,10 +45,10 @@
 
 
 async def _assert_task_removed(
-    base_client: HttpClient, task_id: TaskId, router_prefix: str
+    http_client: HttpClient, task_id: TaskId, router_prefix: str
 ) -> None:
     with pytest.raises(GenericClientError, match=f"No task with {task_id} found"):
-        await base_client.get_task_status(task_id)
+        await http_client.get_task_status(task_id)
 
 
 async def a_test_task(progress: TaskProgress) -> int:
@@ -135,7 +135,7 @@ def mock_task_id() -> TaskId:
 
 
 @pytest.fixture()
-def base_client(bg_task_app: FastAPI, async_client: AsyncClient) -> HttpClient:
+def http_client(bg_task_app: FastAPI, async_client: AsyncClient) -> HttpClient:
     url = TypeAdapter(AnyHttpUrl).validate_python("http://backgroud.testserver.io/")
     return HttpClient(app=bg_task_app, async_client=async_client, base_url=f"{url}")
 
@@ -149,33 +149,33 @@ async def _create_and_get_taskid(async_client: AsyncClient, *, endpoint: str) ->
 
 async def test_task_result(
     async_client: AsyncClient,
-    base_client: HttpClient,
+    http_client: HttpClient,
     router_prefix: str,
 ) -> None:
     task_id = await _create_and_get_taskid(async_client, endpoint="success")
 
     async with periodic_task_result(
-        base_client,
+        http_client,
         task_id,
         task_timeout=10,
         status_poll_interval=TASK_SLEEP_INTERVAL / 3,
     ) as result:
         assert result == 42
 
-    await _assert_task_removed(base_client, task_id, router_prefix)
+    await _assert_task_removed(http_client, task_id, router_prefix)
 
 
 async def test_task_result_times_out(
     async_client: AsyncClient,
-    base_client: HttpClient,
+    http_client: HttpClient,
     router_prefix: str,
 ) -> None:
     task_id = await _create_and_get_taskid(async_client, endpoint="success")
 
     timeout = TASK_SLEEP_INTERVAL / 10
     with pytest.raises(TaskClientTimeoutError) as exec_info:
         async with periodic_task_result(
-            base_client,
+            http_client,
             task_id,
             task_timeout=timeout,
             status_poll_interval=TASK_SLEEP_INTERVAL / 3,
@@ -186,26 +186,26 @@ async def test_task_result_times_out(
         == f"Timed out after {timeout} seconds while awaiting '{task_id}' to complete"
     )
 
-    await _assert_task_removed(base_client, task_id, router_prefix)
+    await _assert_task_removed(http_client, task_id, router_prefix)
 
 
 async def test_task_result_task_result_is_an_error(
     bg_task_app: FastAPI,
     async_client: AsyncClient,
-    base_client: HttpClient,
+    http_client: HttpClient,
     router_prefix: str,
 ) -> None:
     task_id = await _create_and_get_taskid(async_client, endpoint="failing")
 
     with pytest.raises(TaskExceptionError, match="I am failing as requested"):
         async with periodic_task_result(
-            base_client,
+            http_client,
             task_id,
             task_timeout=10,
             status_poll_interval=TASK_SLEEP_INTERVAL / 3,
         ):
             pass
-    await _assert_task_removed(base_client, task_id, router_prefix)
+    await _assert_task_removed(http_client, task_id, router_prefix)
 
 
 @pytest.mark.parametrize("repeat", [1, 2, 10])