✨ Refactor background task setup: rename background_tasks_setup_disabled to background_task_lifespan_disabled for improved clarity

pcrespov · pcrespov · commit 4de05d8c8f43 · 2025-04-10T10:36:01.000+02:00
diff --git a/services/catalog/tests/unit/conftest.py b/services/catalog/tests/unit/conftest.py
@@ -225,21 +225,19 @@ def repository_lifespan_disabled(mocker: MockerFixture):
 
 
 @pytest.fixture
-def background_tasks_setup_disabled(mocker: MockerFixture) -> None:
-    """patch the setup of the background task so we can call it manually"""
-
+def background_task_lifespan_disabled(mocker: MockerFixture) -> None:
     class MockedBackgroundTaskContextManager:
         async def __aenter__(self):
             print(
                 "TEST",
-                background_tasks_setup_disabled.__name__,
+                background_task_lifespan_disabled.__name__,
                 "Disabled background tasks. Skipping execution of __aenter__",
             )
 
         async def __aexit__(self, exc_type, exc_value, traceback):
             print(
                 "TEST",
-                background_tasks_setup_disabled.__name__,
+                background_task_lifespan_disabled.__name__,
                 "Disabled background tasks. Skipping execution of __aexit__",
             )
 
diff --git a/services/catalog/tests/unit/test_api_rest.py b/services/catalog/tests/unit/test_api_rest.py
@@ -11,7 +11,7 @@
 def test_sync_client(
     repository_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     director_setup_disabled: None,
     client: TestClient,
 ):
@@ -26,7 +26,7 @@ def test_sync_client(
 async def test_async_client(
     repository_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     director_setup_disabled: None,
     aclient: httpx.AsyncClient,
 ):
diff --git a/services/catalog/tests/unit/test_service_director.py b/services/catalog/tests/unit/test_service_director.py
@@ -34,7 +34,7 @@ def app_environment(
 
 async def test_director_client_high_level_api(
     repository_lifespan_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     expected_director_list_services: list[dict[str, Any]],
     mocked_director_service_api: MockRouter,
@@ -60,7 +60,7 @@ async def test_director_client_high_level_api(
 
 async def test_director_client_low_level_api(
     repository_lifespan_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     expected_director_list_services: list[dict[str, Any]],
diff --git a/services/catalog/tests/unit/test_utils_service_extras.py b/services/catalog/tests/unit/test_utils_service_extras.py
@@ -20,7 +20,7 @@ async def test_get_service_extras(
     repository_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mock_engine: None,
     mock_service_extras: ServiceExtras,
     aclient: AsyncClient,
diff --git a/services/catalog/tests/unit/test_utils_service_labels.py b/services/catalog/tests/unit/test_utils_service_labels.py
@@ -19,7 +19,7 @@ async def test_get_service_labels(
     repository_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mock_engine: None,
     get_mocked_service_labels: Callable[[str, str], dict],
     aclient: AsyncClient,
diff --git a/services/catalog/tests/unit/with_dbs/test_api_rest_services__get.py b/services/catalog/tests/unit/with_dbs/test_api_rest_services__get.py
@@ -56,7 +56,7 @@ async def expected_service(
                     "execute_access": True,
                     "write_access": True,
                     "product_name": target_product,
-                }
+                },
                 # team_access, everyone_access [optional]
             )
         ]
@@ -66,7 +66,7 @@ async def expected_service(
 
 def test_get_service_with_details(
     service_caching_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: respx.MockRouter,
     user_id: UserID,
diff --git a/services/catalog/tests/unit/with_dbs/test_api_rest_services__list.py b/services/catalog/tests/unit/with_dbs/test_api_rest_services__list.py
@@ -28,7 +28,7 @@
 
 
 async def test_list_services_with_details(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api_base: MockRouter,
     user_id: UserID,
@@ -84,7 +84,7 @@ async def test_list_services_with_details(
 
 
 async def test_list_services_without_details(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     user_id: int,
@@ -128,7 +128,7 @@ async def test_list_services_without_details(
 
 async def test_list_services_without_details_with_wrong_user_id_returns_403(
     service_caching_disabled,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     user_id: int,
@@ -160,7 +160,7 @@ async def test_list_services_without_details_with_wrong_user_id_returns_403(
 
 async def test_list_services_without_details_with_another_product_returns_other_services(
     service_caching_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     user_id: int,
@@ -193,7 +193,7 @@ async def test_list_services_without_details_with_another_product_returns_other_
 
 async def test_list_services_without_details_with_wrong_product_returns_0_service(
     service_caching_disabled,
-    background_tasks_setup_disabled,
+    background_task_lifespan_disabled,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     user_id: int,
@@ -229,7 +229,7 @@ async def test_list_services_without_details_with_wrong_product_returns_0_servic
 
 async def test_list_services_that_are_deprecated(
     service_caching_disabled,
-    background_tasks_setup_disabled,
+    background_task_lifespan_disabled,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api_base: MockRouter,
     user_id: int,
diff --git a/services/catalog/tests/unit/with_dbs/test_api_rest_services_access_rights.py b/services/catalog/tests/unit/with_dbs/test_api_rest_services_access_rights.py
@@ -28,7 +28,7 @@
 
 
 async def test_get_service_access_rights(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     user: dict[str, Any],
@@ -75,7 +75,7 @@ async def test_get_service_access_rights(
 
 
 async def test_get_service_access_rights_with_more_gids(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     user: dict[str, Any],
diff --git a/services/catalog/tests/unit/with_dbs/test_api_rest_services_ports.py b/services/catalog/tests/unit/with_dbs/test_api_rest_services_ports.py
@@ -84,7 +84,7 @@ async def mocked_director_service_api(
 
 async def test_list_service_ports(
     service_caching_disabled: None,
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     mocked_check_service_read_access: None,
     mocked_director_service_api: None,
     rabbitmq_and_rpc_setup_disabled: None,
diff --git a/services/catalog/tests/unit/with_dbs/test_api_rest_services_resources.py b/services/catalog/tests/unit/with_dbs/test_api_rest_services_resources.py
@@ -186,7 +186,7 @@ class _ServiceResourceParams:
     ],
 )
 async def test_get_service_resources(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_labels: Route,
     client: TestClient,
@@ -298,7 +298,7 @@ def factory(services_labels: dict[str, dict[str, Any]]) -> None:
     ],
 )
 async def test_get_service_resources_sim4life_case(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     create_mock_director_service_labels: Callable,
     client: TestClient,
@@ -319,7 +319,7 @@ async def test_get_service_resources_sim4life_case(
 
 
 async def test_get_service_resources_raises_errors(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_labels: Route,
     client: TestClient,
diff --git a/services/catalog/tests/unit/with_dbs/test_api_rest_services_specifications.py b/services/catalog/tests/unit/with_dbs/test_api_rest_services_specifications.py
@@ -26,7 +26,10 @@
 from models_library.generated_models.docker_rest_api import (
     Resources1 as ServiceTaskResources,
 )
-from models_library.generated_models.docker_rest_api import ServiceSpec, TaskSpec
+from models_library.generated_models.docker_rest_api import (
+    ServiceSpec,
+    TaskSpec,
+)
 from models_library.products import ProductName
 from models_library.users import UserID
 from simcore_postgres_database.models.groups import user_to_groups
@@ -124,7 +127,7 @@ def _creator(service_key, service_version, gid) -> ServiceSpecificationsAtDB:
 
 
 async def test_get_service_specifications_returns_403_if_user_does_not_exist(
-    background_tasks_setup_disabled,
+    background_task_lifespan_disabled,
     mocked_director_service_api: respx.MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     client: TestClient,
@@ -145,7 +148,7 @@ async def test_get_service_specifications_returns_403_if_user_does_not_exist(
 
 
 async def test_get_service_specifications_of_unknown_service_returns_default_specs(
-    background_tasks_setup_disabled,
+    background_task_lifespan_disabled,
     mocked_director_service_api: respx.MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     client: TestClient,
@@ -172,7 +175,7 @@ async def test_get_service_specifications_of_unknown_service_returns_default_spe
 
 
 async def test_get_service_specifications(
-    background_tasks_setup_disabled,
+    background_task_lifespan_disabled,
     mocked_director_service_api: respx.MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     client: TestClient,
@@ -267,7 +270,7 @@ async def test_get_service_specifications(
 
 
 async def test_get_service_specifications_are_passed_to_newer_versions_of_service(
-    background_tasks_setup_disabled,
+    background_task_lifespan_disabled,
     mocked_director_service_api: respx.MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     client: TestClient,
diff --git a/services/catalog/tests/unit/with_dbs/test_api_rpc.py b/services/catalog/tests/unit/with_dbs/test_api_rpc.py
@@ -101,7 +101,7 @@ def expected_director_list_services(
 
 @pytest.fixture
 async def background_sync_task_mocked(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     services_db_tables_injector: Callable,
     fake_data_for_services: list,
 ) -> None:
diff --git a/services/catalog/tests/unit/with_dbs/test_core_background_task__sync.py b/services/catalog/tests/unit/with_dbs/test_core_background_task__sync.py
@@ -44,7 +44,7 @@ async def cleanup_service_meta_data_db_content(sqlalchemy_async_engine: AsyncEng
 
 @pytest.mark.parametrize("director_fails", [False, True])
 async def test_registry_sync_task(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     expected_director_list_services: list[dict[str, Any]],
diff --git a/services/catalog/tests/unit/with_dbs/test_service_services_api.py b/services/catalog/tests/unit/with_dbs/test_service_services_api.py
@@ -86,7 +86,7 @@ def expected_director_list_services(
 
 @pytest.fixture
 async def background_sync_task_mocked(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     services_db_tables_injector: Callable,
     fake_services_data: list,
 ) -> None:
@@ -163,7 +163,7 @@ async def test_list_services_paginated(
 
 
 async def test_batch_get_my_services(
-    background_tasks_setup_disabled: None,
+    background_task_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     target_product: ProductName,
