refactor test

Author: Andrei Neagu

services/dynamic-sidecar/tests/unit/api/rpc/test__containers_long_running_tasks.py

@@ -30,12 +30,15 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from pytest_mock.plugin import MockerFixture
+from pytest_simcore.helpers.long_running_tasks import (
+    assert_task_is_no_longer_present,
+    get_fastapi_long_running_manager,
+)
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from servicelib.fastapi.long_running_tasks._manager import FastAPILongRunningManager
 from servicelib.long_running_tasks import lrt_api
-from servicelib.long_running_tasks.errors import TaskNotFoundError
 from servicelib.long_running_tasks.models import LRTNamespace, TaskId
-from servicelib.long_running_tasks.task import TaskRegistry, TasksManager
+from servicelib.long_running_tasks.task import TaskRegistry
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.dynamic_sidecar import (
     containers,
@@ -54,7 +57,6 @@
 )
 from tenacity import (
     AsyncRetrying,
-    TryAgain,
     retry_if_exception_type,
     stop_after_delay,
     wait_fixed,
@@ -190,12 +192,6 @@ def lrt_namespace(app: FastAPI) -> LRTNamespace:
     return long_running_manager.lrt_namespace
 
 
-@pytest.fixture
-def tasks_manager(app: FastAPI) -> TasksManager:
-    tasks_manager: TasksManager = app.state.long_running_manager.tasks_manager
-    return tasks_manager
-
-
 @pytest.fixture
 def shared_store(app: FastAPI) -> SharedStore:
     return app.state.shared_store
@@ -525,9 +521,9 @@ async def test_create_containers_task_invalid_yaml_spec(
 async def test_same_task_id_is_returned_if_task_exists(
     mock_sidecar_lrts: None,
     rpc_client: RabbitMQRPCClient,
+    app: FastAPI,
     node_id: NodeID,
     lrt_namespace: LRTNamespace,
-    tasks_manager: TasksManager,
     mocker: MockerFixture,
     get_task_id_callable: Callable[..., Awaitable[TaskId]],
     mock_stop_heart_beat_task: AsyncMock,
@@ -546,16 +542,9 @@ def _get_awaitable() -> Awaitable[TaskId]:
 
     async def _assert_task_removed(task_id: TaskId) -> None:
         await lrt_api.remove_task(rpc_client, lrt_namespace, {}, task_id)
-        async for attempt in AsyncRetrying(
-            wait=wait_fixed(0.1),
-            stop=stop_after_delay(5),
-            retry=retry_if_exception_type((AssertionError, TryAgain)),
-            reraise=True,
-        ):
-            with attempt:  # noqa: SIM117
-                with pytest.raises(TaskNotFoundError):  # noqa: PT012
-                    await tasks_manager._get_tracked_task(task_id, {})  # noqa: SLF001
-                    raise TryAgain
+        await assert_task_is_no_longer_present(
+            get_fastapi_long_running_manager(app), task_id, {}
+        )
 
     task_id = await _get_awaitable()
     assert task_id.endswith("unique")