reuse fixtures

Author: sanderegg

services/storage/tests/unit/test_data_export.py

@@ -1,7 +1,6 @@
 # pylint: disable=W0621
 # pylint: disable=W0613
 # pylint: disable=R6301
-from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Literal, NamedTuple
@@ -10,7 +9,6 @@
 import pytest
 from celery.exceptions import CeleryError
 from faker import Faker
-from fastapi import FastAPI
 from models_library.api_schemas_long_running_tasks.tasks import TaskResult
 from models_library.api_schemas_rpc_async_jobs.async_jobs import (
     AsyncJobGet,
@@ -35,15 +33,11 @@
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_mock import MockerFixture
-from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.storage_utils import FileIDDict, ProjectWithFilesParams
-from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
 from servicelib.rabbitmq.rpc_interfaces.storage.data_export import start_data_export
-from settings_library.rabbit import RabbitSettings
 from simcore_service_storage.api.rpc._data_export import AccessRightError
-from simcore_service_storage.core.settings import ApplicationSettings
 from simcore_service_storage.modules.celery.client import TaskUUID
 from simcore_service_storage.modules.celery.models import TaskState, TaskStatus
 from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
@@ -123,38 +117,6 @@ async def mock_celery_client(
     return _celery_client
 
 
-@pytest.fixture
-async def app_environment(
-    app_environment: EnvVarsDict,
-    rabbit_service: RabbitSettings,
-    monkeypatch: pytest.MonkeyPatch,
-):
-    new_envs = setenvs_from_dict(
-        monkeypatch,
-        {
-            **app_environment,
-            "RABBIT_HOST": rabbit_service.RABBIT_HOST,
-            "RABBIT_PORT": f"{rabbit_service.RABBIT_PORT}",
-            "RABBIT_USER": rabbit_service.RABBIT_USER,
-            "RABBIT_SECURE": f"{rabbit_service.RABBIT_SECURE}",
-            "RABBIT_PASSWORD": rabbit_service.RABBIT_PASSWORD.get_secret_value(),
-        },
-    )
-
-    settings = ApplicationSettings.create_from_envs()
-    assert settings.STORAGE_RABBITMQ
-
-    return new_envs
-
-
-@pytest.fixture
-async def rpc_client(
-    initialized_app: FastAPI,
-    rabbitmq_rpc_client: Callable[[str], Awaitable[RabbitMQRPCClient]],
-) -> RabbitMQRPCClient:
-    return await rabbitmq_rpc_client("client")
-
-
 class UserWithFile(NamedTuple):
     user: UserID
     file: Path
@@ -196,7 +158,7 @@ class UserWithFile(NamedTuple):
     indirect=True,
 )
 async def test_start_data_export_success(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
     with_random_project_with_files: tuple[
         dict[str, Any],
@@ -224,7 +186,7 @@ async def test_start_data_export_success(
         pytest.fail(f"invalid parameter: {selection_type=}")
 
     result = await start_data_export(
-        rpc_client,
+        storage_rabbitmq_rpc_client,
         job_id_data=AsyncJobNameData(user_id=user_id, product_name="osparc"),
         data_export_start=DataExportTaskStartInput(
             location_id=0,
@@ -259,15 +221,14 @@ async def test_start_data_export_success(
     indirect=True,
 )
 async def test_start_data_export_scheduler_error(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
     with_random_project_with_files: tuple[
         dict[str, Any],
         dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
     ],
     user_id: UserID,
 ):
-
     _, list_of_files = with_random_project_with_files
     workspace_files = [
         p for p in list(list_of_files.values())[0].keys() if "/workspace/" in p
@@ -277,7 +238,7 @@ async def test_start_data_export_scheduler_error(
 
     with pytest.raises(JobSchedulerError):
         _ = await start_data_export(
-            rpc_client,
+            storage_rabbitmq_rpc_client,
             job_id_data=AsyncJobNameData(user_id=user_id, product_name="osparc"),
             data_export_start=DataExportTaskStartInput(
                 location_id=0,
@@ -294,14 +255,14 @@ async def test_start_data_export_scheduler_error(
     indirect=True,
 )
 async def test_start_data_export_access_error(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
     user_id: UserID,
     faker: Faker,
 ):
     with pytest.raises(AccessRightError):
         _ = await async_jobs.submit(
-            rpc_client,
+            storage_rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             method_name="start_data_export",
             job_id_data=AsyncJobNameData(user_id=user_id, product_name="osparc"),
@@ -325,13 +286,13 @@ async def test_start_data_export_access_error(
     indirect=True,
 )
 async def test_abort_data_export_success(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
 ):
     assert mock_celery_client.get_task_uuids_object is not None
     assert not isinstance(mock_celery_client.get_task_uuids_object, Exception)
     await async_jobs.cancel(
-        rpc_client,
+        storage_rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id_data=AsyncJobNameData(
             user_id=_faker.pyint(min_value=1, max_value=100), product_name="osparc"
@@ -355,7 +316,7 @@ async def test_abort_data_export_success(
     indirect=["mock_celery_client"],
 )
 async def test_abort_data_export_error(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
     expected_exception_type: type[Exception],
 ):
@@ -365,7 +326,7 @@ async def test_abort_data_export_error(
     _job_id = next(iter(job_ids)) if len(job_ids) > 0 else AsyncJobId(_faker.uuid4())
     with pytest.raises(expected_exception_type):
         await async_jobs.cancel(
-            rpc_client,
+            storage_rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             job_id_data=AsyncJobNameData(
                 user_id=_faker.pyint(min_value=1, max_value=100), product_name="osparc"
@@ -389,15 +350,15 @@ async def test_abort_data_export_error(
     indirect=True,
 )
 async def test_get_data_export_status(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
 ):
     job_ids = mock_celery_client.get_task_uuids_object
     assert job_ids is not None
     assert not isinstance(job_ids, Exception)
     _job_id = next(iter(job_ids)) if len(job_ids) > 0 else AsyncJobId(_faker.uuid4())
     result = await async_jobs.status(
-        rpc_client,
+        storage_rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=_job_id,
         job_id_data=AsyncJobNameData(
@@ -426,7 +387,7 @@ async def test_get_data_export_status(
     indirect=["mock_celery_client"],
 )
 async def test_get_data_export_status_error(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
     expected_exception_type: type[Exception],
 ):
@@ -436,7 +397,7 @@ async def test_get_data_export_status_error(
     _job_id = next(iter(job_ids)) if len(job_ids) > 0 else AsyncJobId(_faker.uuid4())
     with pytest.raises(expected_exception_type):
         _ = await async_jobs.status(
-            rpc_client,
+            storage_rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             job_id=_job_id,
             job_id_data=AsyncJobNameData(
@@ -461,15 +422,15 @@ async def test_get_data_export_status_error(
     indirect=True,
 )
 async def test_get_data_export_result_success(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
 ):
     job_ids = mock_celery_client.get_task_uuids_object
     assert job_ids is not None
     assert not isinstance(job_ids, Exception)
     _job_id = next(iter(job_ids)) if len(job_ids) > 0 else AsyncJobId(_faker.uuid4())
     result = await async_jobs.result(
-        rpc_client,
+        storage_rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=_job_id,
         job_id_data=AsyncJobNameData(
@@ -536,7 +497,7 @@ async def test_get_data_export_result_success(
     indirect=["mock_celery_client"],
 )
 async def test_get_data_export_result_error(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: _MockCeleryClient,
     expected_exception: type[Exception],
 ):
@@ -547,7 +508,7 @@ async def test_get_data_export_result_error(
 
     with pytest.raises(expected_exception):
         _ = await async_jobs.result(
-            rpc_client,
+            storage_rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             job_id=_job_id,
             job_id_data=AsyncJobNameData(
@@ -564,11 +525,11 @@ async def test_get_data_export_result_error(
     indirect=True,
 )
 async def test_list_jobs_success(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: MockerFixture,
 ):
     result = await async_jobs.list_jobs(
-        rpc_client,
+        storage_rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id_data=AsyncJobNameData(
             user_id=_faker.pyint(min_value=1, max_value=100), product_name="osparc"
@@ -587,12 +548,12 @@ async def test_list_jobs_success(
     indirect=True,
 )
 async def test_list_jobs_error(
-    rpc_client: RabbitMQRPCClient,
+    storage_rabbitmq_rpc_client: RabbitMQRPCClient,
     mock_celery_client: MockerFixture,
 ):
     with pytest.raises(JobSchedulerError):
         _ = await async_jobs.list_jobs(
-            rpc_client,
+            storage_rabbitmq_rpc_client,
             rpc_namespace=STORAGE_RPC_NAMESPACE,
             job_id_data=AsyncJobNameData(
                 user_id=_faker.pyint(min_value=1, max_value=100), product_name="osparc"