fast cancellation of lrt

Author: Andrei Neagu

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

@@ -0,0 +1,14 @@
+from datetime import timedelta
+
+import pytest
+from pytest_mock import MockerFixture
+
+
+@pytest.fixture
+async def fast_long_running_tasks_cancellation(
+    mocker: MockerFixture,
+) -> None:
+    mocker.patch(
+        "servicelib.long_running_tasks.task._CANCEL_TASKS_CHECK_INTERVAL",
+        new=timedelta(seconds=1),
+    )

packages/service-library/tests/conftest.py

@@ -26,6 +26,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.file_extra",
     "pytest_simcore.logging",
+    "pytest_simcore.long_running_tasks",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.redis_service",

packages/service-library/tests/long_running_tasks/conftest.py

@@ -6,7 +6,6 @@
 
 import pytest
 from faker import Faker
-from pytest_mock import MockerFixture
 from servicelib.logging_utils import log_catch
 from servicelib.long_running_tasks.task import (
     RedisNamespace,
@@ -18,19 +17,9 @@
 _logger = logging.getLogger(__name__)
 
 
-@pytest.fixture
-async def mock_cancel_tasks_check_interval(
-    mocker: MockerFixture,
-) -> None:
-    mocker.patch(
-        "servicelib.long_running_tasks.task._CANCEL_TASKS_CHECK_INTERVAL",
-        new=timedelta(seconds=TEST_CHECK_STALE_INTERVAL_S),
-    )
-
-
 @pytest.fixture
 async def get_tasks_manager(
-    mock_cancel_tasks_check_interval: None, faker: Faker
+    fast_long_running_tasks_cancellation: None, faker: Faker
 ) -> AsyncIterator[
     Callable[[RedisSettings, RedisNamespace | None], Awaitable[TasksManager]]
 ]:

services/dynamic-sidecar/tests/conftest.py

@@ -42,6 +42,7 @@
     "pytest_simcore.docker_swarm",
     "pytest_simcore.faker_users_data",
     "pytest_simcore.logging",
+    "pytest_simcore.long_running_tasks",
     "pytest_simcore.minio_service",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pytest_global_environs",
@@ -169,6 +170,7 @@ def mock_rabbit_check(mocker: MockerFixture) -> None:
 
 @pytest.fixture
 def base_mock_envs(
+    fast_long_running_tasks_cancellation: None,
     use_in_memory_redis: RedisSettings,
     dy_volumes: Path,
     shared_store_dir: Path,
@@ -211,6 +213,7 @@ def base_mock_envs(
 
 @pytest.fixture
 def mock_environment(
+    fast_long_running_tasks_cancellation: None,
     use_in_memory_redis: RedisSettings,
     mock_storage_check: None,
     mock_postgres_check: None,