fix: tests

Author: giancarloromeo

services/storage/tests/conftest.py

@@ -65,6 +65,7 @@
 )
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp import status
+from servicelib.fastapi.app_server import FastAPIAppServer
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.utils import limited_gather
 from settings_library.rabbit import RabbitSettings
@@ -1001,11 +1002,11 @@ async def with_storage_celery_worker_controller(
     # Signals must be explicitily connected
     monkeypatch.setenv("STORAGE_WORKER_MODE", "true")
     app_settings = ApplicationSettings.create_from_envs()
-    app_factory = partial(create_app, app_settings)
 
-    def _on_worker_init_wrapper(sender: WorkController, **_kwargs) -> None:
-        assert app_settings.STORAGE_CELERY  # nosec
-        return partial(on_worker_init, app_factory, app_settings.STORAGE_CELERY)(
+    app_server = FastAPIAppServer(app=create_app(app_settings))
+
+    def _on_worker_init_wrapper(sender: WorkController, **_kwargs):
+        return partial(on_worker_init, app_server, app_settings.STORAGE_CELERY)(
             sender, **_kwargs
         )
 

services/storage/tests/unit/test_modules_celery.py

@@ -13,7 +13,7 @@
 import pytest
 from celery import Celery, Task
 from celery.contrib.abortable import AbortableTask
-from celery_library import get_celery_client, get_event_loop
+from celery_library import get_celery_client
 from celery_library.errors import TransferrableCeleryError
 from celery_library.models import (
     TaskContext,
@@ -26,7 +26,7 @@
     register_task,
 )
 from celery_library.task_manager import CeleryTaskManager
-from celery_library.utils import get_fastapi_app, get_task_manager
+from celery_library.utils import get_app_server, get_task_manager
 from common_library.errors_classes import OsparcErrorMixin
 from fastapi import FastAPI
 from models_library.progress_bar import ProgressReport
@@ -72,7 +72,7 @@ def fake_file_processor(task: Task, task_id: TaskID, files: list[str]) -> str:
     _logger.info("Calling _fake_file_processor")
     return asyncio.run_coroutine_threadsafe(
         _fake_file_processor(task.app, task.name, task.request.id, files),
-        get_event_loop(get_fastapi_app(task.app)),
+        get_app_server(task.app).event_loop,
     ).result()