remove unused fixture

Author: giancarloromeo

services/storage/tests/conftest.py

@@ -27,8 +27,6 @@
 from celery.signals import worker_init, worker_shutdown
 from celery.worker.worker import WorkController
 from celery_library.signals import on_worker_init, on_worker_shutdown
-from celery_library.task_manager import CeleryTaskManager
-from celery_library.utils import get_task_manager
 from faker import Faker
 from fakeredis.aioredis import FakeRedis
 from fastapi import FastAPI
@@ -365,7 +363,7 @@ def upload_file(
     create_upload_file_link_v2: Callable[..., Awaitable[FileUploadSchema]],
     create_file_of_size: Callable[[ByteSize, str | None], Path],
     create_simcore_file_id: Callable[[ProjectID, NodeID, str], SimcoreS3FileID],
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ) -> Callable[
     [ByteSize, str, SimcoreS3FileID | None], Awaitable[tuple[Path, SimcoreS3FileID]]
 ]:
@@ -480,7 +478,7 @@ async def create_empty_directory(
     create_simcore_file_id: Callable[[ProjectID, NodeID, str], SimcoreS3FileID],
     create_upload_file_link_v2: Callable[..., Awaitable[FileUploadSchema]],
     client: httpx.AsyncClient,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ) -> Callable[[str, ProjectID, NodeID], Awaitable[SimcoreS3FileID]]:
     async def _directory_creator(
         dir_name: str, project_id: ProjectID, node_id: NodeID
@@ -993,7 +991,7 @@ def _(celery_app: Celery) -> None: ...
 
 
 @pytest.fixture
-async def with_storage_celery_worker_controller(
+async def with_storage_celery_worker(
     app_environment: EnvVarsDict,
     celery_app: Celery,
     monkeypatch: pytest.MonkeyPatch,
@@ -1028,14 +1026,6 @@ def _on_worker_init_wrapper(sender: WorkController, **_kwargs):
         yield worker
 
 
-@pytest.fixture
-def with_storage_celery_worker(
-    with_storage_celery_worker_controller: TestWorkController,
-) -> CeleryTaskManager:
-    assert isinstance(with_storage_celery_worker_controller.app, Celery)
-    return get_task_manager(with_storage_celery_worker_controller.app)
-
-
 @pytest.fixture
 async def storage_rabbitmq_rpc_client(
     rabbitmq_rpc_client: Callable[[str], Awaitable[RabbitMQRPCClient]],

services/storage/tests/unit/test_async_jobs.py

@@ -10,9 +10,9 @@
 
 import pytest
 from celery import Celery, Task
+from celery.contrib.testing.worker import TestWorkController
 from celery_library.models import TaskID, TaskMetadata
 from celery_library.task import register_task
-from celery_library.task_manager import CeleryTaskManager
 from fastapi import FastAPI
 from models_library.api_schemas_rpc_async_jobs.async_jobs import (
     AsyncJobGet,
@@ -202,7 +202,7 @@ async def test_async_jobs_workflow(
     initialized_app: FastAPI,
     register_rpc_routes: None,
     storage_rabbitmq_rpc_client: RabbitMQRPCClient,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
     user_id: UserID,
     product_name: ProductName,
     exposed_rpc_start: str,
@@ -250,7 +250,7 @@ async def test_async_jobs_cancel(
     initialized_app: FastAPI,
     register_rpc_routes: None,
     storage_rabbitmq_rpc_client: RabbitMQRPCClient,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
     user_id: UserID,
     product_name: ProductName,
     exposed_rpc_start: str,
@@ -315,7 +315,7 @@ async def test_async_jobs_raises(
     initialized_app: FastAPI,
     register_rpc_routes: None,
     storage_rabbitmq_rpc_client: RabbitMQRPCClient,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
     user_id: UserID,
     product_name: ProductName,
     exposed_rpc_start: str,

services/storage/tests/unit/test_handlers_files.py

@@ -23,7 +23,7 @@
 from aiohttp import ClientSession
 from aws_library.s3 import S3KeyNotFoundError, S3ObjectKey, SimcoreS3API
 from aws_library.s3._constants import MULTIPART_UPLOADS_MIN_TOTAL_SIZE
-from celery_library.task_manager import CeleryTaskManager
+from celery.contrib.testing.worker import TestWorkController
 from faker import Faker
 from fastapi import FastAPI
 from models_library.api_schemas_storage.storage_schemas import (
@@ -683,7 +683,7 @@ async def test_upload_real_file_with_s3_client(
     node_id: NodeID,
     faker: Faker,
     s3_client: S3Client,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ):
     file_size = TypeAdapter(ByteSize).validate_python("500Mib")
     file_name = faker.file_name()

services/storage/tests/unit/test_modules_celery.py

@@ -13,6 +13,7 @@
 import pytest
 from celery import Celery, Task
 from celery.contrib.abortable import AbortableTask
+from celery.contrib.testing.worker import TestWorkController
 from celery_library.errors import TransferrableCeleryError
 from celery_library.models import (
     TaskContext,
@@ -42,7 +43,7 @@
 @pytest.fixture
 def celery_client(
     initialized_app: FastAPI,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ) -> CeleryTaskManager:
     return get_task_manager_from_app(initialized_app)
 

services/storage/tests/unit/test_rpc_handlers_paths.py

@@ -13,7 +13,7 @@
 from typing import Any, TypeAlias
 
 import pytest
-from celery_library.task_manager import CeleryTaskManager
+from celery.contrib.testing.worker import TestWorkController
 from faker import Faker
 from fastapi import FastAPI
 from models_library.api_schemas_rpc_async_jobs.async_jobs import (
@@ -265,7 +265,7 @@ async def test_path_compute_size_inexistent_path(
     mock_celery_app: None,
     initialized_app: FastAPI,
     storage_rabbitmq_rpc_client: RabbitMQRPCClient,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
     location_id: LocationID,
     user_id: UserID,
     faker: Faker,
@@ -294,7 +294,7 @@ async def test_delete_paths_empty_set(
     user_id: UserID,
     location_id: LocationID,
     product_name: ProductName,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ):
     await _assert_delete_paths(
         storage_rabbitmq_rpc_client,
@@ -333,7 +333,7 @@ async def test_delete_paths(
     ],
     project_params: ProjectWithFilesParams,
     product_name: ProductName,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ):
     assert (
         len(project_params.allowed_file_sizes) == 1

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

@@ -113,7 +113,7 @@ async def test_copy_folders_from_non_existing_project(
     product_name: ProductName,
     create_project: Callable[..., Awaitable[dict[str, Any]]],
     faker: Faker,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ):
     src_project = await create_project()
     incorrect_src_project = deepcopy(src_project)
@@ -154,7 +154,7 @@ async def test_copy_folders_from_empty_project(
     product_name: ProductName,
     create_project: Callable[[], Awaitable[dict[str, Any]]],
     sqlalchemy_async_engine: AsyncEngine,
-    with_storage_celery_worker: CeleryTaskManager,
+    with_storage_celery_worker: TestWorkController,
 ):
     # we will copy from src to dst
     src_project = await create_project()