Skip to content

Commit f8a575b

Browse files
fix test
1 parent 2ceee86 commit f8a575b

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

services/storage/tests/conftest.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
from celery import Celery
2525
from celery.contrib.testing.worker import TestWorkController, start_worker
2626
from celery.signals import worker_init, worker_shutdown
27-
from celery.worker.worker import WorkController
28-
from celery_library.signals import on_worker_init, on_worker_shutdown
27+
from celery_library.worker.signals import _worker_init_wrapper, _worker_shutdown_wrapper
2928
from faker import Faker
3029
from fakeredis.aioredis import FakeRedis
3130
from fastapi import FastAPI
@@ -70,7 +69,7 @@
7069
from settings_library.rabbit import RabbitSettings
7170
from simcore_postgres_database.models.tokens import tokens
7271
from simcore_postgres_database.storage_models import file_meta_data, projects, users
73-
from simcore_service_storage.api._worker_tasks.tasks import setup_worker_tasks
72+
from simcore_service_storage.api._worker_tasks.tasks import register_worker_tasks
7473
from simcore_service_storage.core.application import create_app
7574
from simcore_service_storage.core.settings import ApplicationSettings
7675
from simcore_service_storage.datcore_dsm import DatCoreDataManager
@@ -1023,17 +1022,14 @@ async def with_storage_celery_worker(
10231022
service_name="storage-api",
10241023
)
10251024

1026-
app_server = FastAPIAppServer(
1027-
app=create_app(app_settings, tracing_config=tracing_config)
1028-
)
1029-
1030-
def _on_worker_init_wrapper(sender: WorkController, **_kwargs):
1031-
return on_worker_init(sender, app_server, **_kwargs)
1025+
app_server = FastAPIAppServer(app=create_app(app_settings, tracing_config))
10321026

1033-
worker_init.connect(_on_worker_init_wrapper)
1034-
worker_shutdown.connect(on_worker_shutdown)
1027+
worker_init.connect(
1028+
_worker_init_wrapper(celery_app, lambda: app_server), weak=False
1029+
)
1030+
worker_shutdown.connect(_worker_shutdown_wrapper(celery_app), weak=False)
10351031

1036-
setup_worker_tasks(celery_app)
1032+
register_worker_tasks(celery_app)
10371033
register_celery_tasks(celery_app)
10381034

10391035
with start_worker(

0 commit comments

Comments
 (0)