fixed celery tests

Author: sanderegg

services/storage/src/simcore_service_storage/main.py

@@ -17,6 +17,4 @@
     tracing_settings=_settings.STORAGE_TRACING,
 )
 
-_logger = logging.getLogger(__name__)
-
 app = create_app(_settings)

services/storage/src/simcore_service_storage/modules/celery/client.py

@@ -71,15 +71,15 @@ def send_task(
             self._celery_app.send_task(task_name, task_id=task_id, kwargs=task_params)
             return task_uuid
 
-    @make_async()
     @staticmethod
+    @make_async()
     def abort_task(task_context: TaskContext, task_uuid: TaskUUID) -> None:
         task_id = _build_task_id(task_context, task_uuid)
         _logger.info("Aborting task %s", task_id)
         AbortableAsyncResult(task_id).abort()
 
-    @make_async()
     @staticmethod
+    @make_async()
     def get_task_result(task_context: TaskContext, task_uuid: TaskUUID) -> Any:
         task_id = _build_task_id(task_context, task_uuid)
         with log_context(

services/storage/src/simcore_service_storage/modules/celery/worker_main.py

@@ -23,7 +23,6 @@
     tracing_settings=_settings.STORAGE_TRACING,
 )
 
-_logger = logging.getLogger(__name__)
 
 assert _settings.STORAGE_CELERY
 app = create_celery_app(_settings.STORAGE_CELERY)

services/storage/tests/unit/modules/celery/conftest.py

@@ -1,3 +1,4 @@
+import logging
 from collections.abc import Callable, Iterable
 from datetime import timedelta
 from typing import Any
@@ -7,6 +8,8 @@
 from celery.contrib.testing.worker import TestWorkController, start_worker
 from celery.signals import worker_init, worker_shutdown
 from pytest_simcore.helpers.typing_env import EnvVarsDict
+from servicelib.logging_utils import config_all_loggers
+from simcore_service_storage.core.settings import ApplicationSettings
 from simcore_service_storage.modules.celery.client import CeleryTaskQueueClient
 from simcore_service_storage.modules.celery.signals import (
     on_worker_init,
@@ -50,10 +53,18 @@ def celery_client(
 @pytest.fixture
 def celery_worker_controller(
     app_environment: EnvVarsDict,
+    app_settings: ApplicationSettings,
     register_celery_tasks: Callable[[Celery], None],
     celery_app: Celery,
 ) -> Iterable[TestWorkController]:
     # Signals must be explicitily connected
+    logging.basicConfig(level=logging.WARNING)  # NOSONAR
+    logging.root.setLevel(app_settings.log_level)
+    config_all_loggers(
+        log_format_local_dev_enabled=app_settings.STORAGE_LOG_FORMAT_LOCAL_DEV_ENABLED,
+        logger_filter_mapping=app_settings.STORAGE_LOG_FILTER_MAPPING,
+        tracing_settings=app_settings.STORAGE_TRACING,
+    )
     worker_init.connect(on_worker_init)
     worker_shutdown.connect(on_worker_shutdown)
 

services/storage/tests/unit/modules/celery/test_celery.py

@@ -27,6 +27,9 @@
 
 _logger = logging.getLogger(__name__)
 
+pytest_simcore_core_services_selection = ["postgres"]
+pytest_simcore_ops_services_selection = []
+
 
 async def _async_archive(
     celery_app: Celery, task_name: str, task_id: str, files: list[str]