minor changes

Author: bisgaard-itis

packages/celery-library/tests/unit/conftest.py

@@ -127,7 +127,7 @@ def _on_worker_init_wrapper(sender: WorkController, **_kwargs) -> None:
 
 
 @pytest.fixture
-def with_storage_celery_worker(
+def with_celery_worker(
     celery_worker_controller: TestWorkController,
 ) -> CeleryTaskWorker:
     assert isinstance(celery_worker_controller.app, Celery)

packages/celery-library/tests/unit/test_async_jobs.py

@@ -3,7 +3,7 @@
 
 import asyncio
 import pickle
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from datetime import timedelta
 from enum import Enum
 from typing import Any
@@ -108,12 +108,19 @@ async def async_job(task: Task, task_id: TaskID, action: Action, payload: Any) -
 
 
 @pytest.fixture
-async def rpc_client(
+async def register_routes(
     initialized_fast_api: FastAPI, rpc_namespace: RPCNamespace
-) -> RabbitMQRPCClient:
+) -> None:
     client = initialized_fast_api.state.rabbitmq_rpc_client
     assert isinstance(client, RabbitMQRPCClient)
     await client.register_router(router, rpc_namespace, initialized_fast_api)
+
+
+@pytest.fixture
+async def rpc_client(
+    rabbitmq_rpc_client: Callable[[str], Awaitable[RabbitMQRPCClient]],
+) -> RabbitMQRPCClient:
+    client = await rabbitmq_rpc_client("celery_test_client")
     return client
 
 
@@ -204,9 +211,10 @@ async def _wait_for_job(
     ],
 )
 async def test_async_jobs_workflow(
+    register_routes,
     rpc_client: RabbitMQRPCClient,
     rpc_namespace: RPCNamespace,
-    with_storage_celery_worker: CeleryTaskWorker,
+    with_celery_worker: CeleryTaskWorker,
     user_id: UserID,
     product_name: ProductName,
     exposed_rpc_start: str,
@@ -257,7 +265,7 @@ async def test_async_jobs_cancel(
     register_rpc_routes: None,
     rpc_namespace: RPCNamespace,
     storage_rabbitmq_rpc_client: RabbitMQRPCClient,
-    with_storage_celery_worker: CeleryTaskWorker,
+    with_celery_worker: CeleryTaskWorker,
     user_id: UserID,
     product_name: ProductName,
     exposed_rpc_start: str,
@@ -325,7 +333,7 @@ async def test_async_jobs_raises(
     register_rpc_routes: None,
     rpc_namespace: RPCNamespace,
     storage_rabbitmq_rpc_client: RabbitMQRPCClient,
-    with_storage_celery_worker: CeleryTaskWorker,
+    with_celery_worker: CeleryTaskWorker,
     user_id: UserID,
     product_name: ProductName,
     exposed_rpc_start: str,

packages/celery-library/tests/unit/test_modules_celery.py

@@ -43,7 +43,7 @@
 @pytest.fixture
 def celery_client(
     initialized_app: FastAPI,
-    with_storage_celery_worker: CeleryTaskWorker,
+    with_celery_worker: CeleryTaskWorker,
 ) -> CeleryTaskClient:
     return get_celery_client(initialized_app)