fixed tests

Author: Andrei Neagu

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

@@ -19,9 +19,10 @@
 from fastapi import APIRouter, Depends, FastAPI, status
 from httpx import AsyncClient
 from pydantic import TypeAdapter
+from servicelib.fastapi.long_running_tasks._manager import FastAPILongRunningManager
 from servicelib.fastapi.long_running_tasks.client import setup as setup_client
 from servicelib.fastapi.long_running_tasks.server import (
-    get_tasks_manager,
+    get_long_running_manager,
 )
 from servicelib.fastapi.long_running_tasks.server import setup as setup_server
 from servicelib.long_running_tasks.models import (
@@ -30,7 +31,7 @@
     TaskProgress,
     TaskStatus,
 )
-from servicelib.long_running_tasks.task import TaskContext, TasksManager, start_task
+from servicelib.long_running_tasks.task import TaskContext, start_task
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
 from tenacity.stop import stop_after_delay
@@ -69,10 +70,12 @@ async def create_string_list_task(
         num_strings: int,
         sleep_time: float,
         fail: bool = False,
-        task_manager: TasksManager = Depends(get_tasks_manager),
+        long_running_manager: FastAPILongRunningManager = Depends(
+            get_long_running_manager
+        ),
     ) -> TaskId:
         task_id = start_task(
-            task_manager,
+            long_running_manager.tasks_manager,
             _string_list_task,
             num_strings=num_strings,
             sleep_time=sleep_time,

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

@@ -11,9 +11,10 @@
 from httpx import AsyncClient
 from pydantic import AnyHttpUrl, PositiveFloat, TypeAdapter
 from servicelib.fastapi.long_running_tasks._context_manager import _ProgressManager
+from servicelib.fastapi.long_running_tasks._manager import FastAPILongRunningManager
 from servicelib.fastapi.long_running_tasks.client import Client, periodic_task_result
 from servicelib.fastapi.long_running_tasks.client import setup as setup_client
-from servicelib.fastapi.long_running_tasks.server import get_tasks_manager
+from servicelib.fastapi.long_running_tasks.server import get_long_running_manager
 from servicelib.fastapi.long_running_tasks.server import setup as setup_server
 from servicelib.long_running_tasks.errors import (
     TaskClientTimeoutError,
@@ -24,7 +25,7 @@
     TaskId,
     TaskProgress,
 )
-from servicelib.long_running_tasks.task import TasksManager, start_task
+from servicelib.long_running_tasks.task import start_task
 
 TASK_SLEEP_INTERVAL: Final[PositiveFloat] = 0.1
 
@@ -55,16 +56,22 @@ def user_routes() -> APIRouter:
 
     @router.get("/api/success", status_code=status.HTTP_200_OK)
     async def create_task_user_defined_route(
-        tasks_manager: TasksManager = Depends(get_tasks_manager),
+        long_running_manager: FastAPILongRunningManager = Depends(
+            get_long_running_manager
+        ),
     ) -> TaskId:
-        task_id = start_task(tasks_manager, task=a_test_task)
+        task_id = start_task(long_running_manager.tasks_manager, task=a_test_task)
         return task_id
 
     @router.get("/api/failing", status_code=status.HTTP_200_OK)
     async def create_task_which_fails(
-        task_manager: TasksManager = Depends(get_tasks_manager),
+        long_running_manager: FastAPILongRunningManager = Depends(
+            get_long_running_manager
+        ),
     ) -> TaskId:
-        task_id = start_task(task_manager, task=a_failing_test_task)
+        task_id = start_task(
+            long_running_manager.tasks_manager, task=a_failing_test_task
+        )
         return task_id
 
     return router