rename

Author: sanderegg

services/storage/tests/conftest.py

@@ -364,7 +364,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],
-    celery_worker: CeleryTaskQueueWorker,
+    with_storage_celery_worker: CeleryTaskQueueWorker,
 ) -> Callable[
     [ByteSize, str, SimcoreS3FileID | None], Awaitable[tuple[Path, SimcoreS3FileID]]
 ]:
@@ -994,7 +994,7 @@ def _(celery_app: Celery) -> None: ...
 
 
 @pytest.fixture
-async def celery_worker_controller(
+async def with_storage_celery_worker_controller(
     app_environment: EnvVarsDict,
     celery_app: Celery,
     monkeypatch: pytest.MonkeyPatch,
@@ -1026,11 +1026,11 @@ async def celery_worker_controller(
 
 
 @pytest.fixture
-def celery_worker(
-    celery_worker_controller: TestWorkController,
+def with_storage_celery_worker(
+    with_storage_celery_worker_controller: TestWorkController,
 ) -> CeleryTaskQueueWorker:
-    assert isinstance(celery_worker_controller.app, Celery)
-    return CeleryTaskQueueWorker(celery_worker_controller.app)
+    assert isinstance(with_storage_celery_worker_controller.app, Celery)
+    return CeleryTaskQueueWorker(with_storage_celery_worker_controller.app)
 
 
 @pytest.fixture

services/storage/tests/unit/test_modules_celery.py

@@ -27,8 +27,8 @@
     TaskState,
 )
 from simcore_service_storage.modules.celery.utils import (
-    get_celery_worker,
     get_fastapi_app,
+    get_with_storage_celery_worker,
 )
 from simcore_service_storage.modules.celery.worker import CeleryTaskQueueWorker
 from tenacity import Retrying, retry_if_exception_type, stop_after_delay, wait_fixed
@@ -49,7 +49,7 @@ def celery_client(
 async def _async_archive(
     celery_app: Celery, task_name: str, task_id: str, files: list[str]
 ) -> str:
-    worker = get_celery_worker(celery_app)
+    worker = get_with_storage_celery_worker(celery_app)
 
     def sleep_for(seconds: float) -> None:
         time.sleep(seconds)
@@ -108,7 +108,7 @@ def _(celery_app: Celery) -> None:
 
 async def test_submitting_task_calling_async_function_results_with_success_state(
     celery_client: CeleryTaskQueueClient,
-    celery_worker: CeleryTaskQueueWorker,
+    with_storage_celery_worker: CeleryTaskQueueWorker,
 ):
     task_context = TaskContext(user_id=42)
 
@@ -137,7 +137,7 @@ async def test_submitting_task_calling_async_function_results_with_success_state
 
 async def test_submitting_task_with_failure_results_with_error(
     celery_client: CeleryTaskQueueClient,
-    celery_worker: CeleryTaskQueueWorker,
+    with_storage_celery_worker: CeleryTaskQueueWorker,
 ):
     task_context = TaskContext(user_id=42)
 
@@ -163,7 +163,7 @@ async def test_submitting_task_with_failure_results_with_error(
 
 async def test_aborting_task_results_with_aborted_state(
     celery_client: CeleryTaskQueueClient,
-    celery_worker: CeleryTaskQueueWorker,
+    with_storage_celery_worker: CeleryTaskQueueWorker,
 ):
     task_context = TaskContext(user_id=42)
 
@@ -190,7 +190,7 @@ async def test_aborting_task_results_with_aborted_state(
 
 async def test_listing_task_uuids_contains_submitted_task(
     celery_client: CeleryTaskQueueClient,
-    celery_worker: CeleryTaskQueueWorker,
+    with_storage_celery_worker: CeleryTaskQueueWorker,
 ):
     task_context = TaskContext(user_id=42)
 

services/storage/tests/unit/test_rpc_handlers_paths.py

@@ -231,7 +231,7 @@ async def test_path_compute_size_inexistent_path(
     mock_celery_app: None,
     initialized_app: FastAPI,
     storage_rabbitmq_rpc_client: RabbitMQRPCClient,
-    celery_worker: CeleryTaskQueueWorker,
+    with_storage_celery_worker: CeleryTaskQueueWorker,
     location_id: LocationID,
     user_id: UserID,
     faker: Faker,

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

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