Skip to content

Commit c297397

Browse files
committed
minor change
1 parent 18effae commit c297397

File tree

1 file changed

+1
-45
lines changed

1 file changed

+1
-45
lines changed

services/api-server/tests/unit/celery/test_tasks.py

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# pylint: disable=redefined-outer-name
22
# pylint: disable=unused-argument
33

4-
from typing import Any
54

65
import pytest
76
from celery.contrib.testing.worker import TestWorkController
@@ -10,14 +9,12 @@
109
from httpx import AsyncClient, BasicAuth
1110
from models_library.api_schemas_long_running_tasks.tasks import TaskGet, TaskStatus
1211
from models_library.api_schemas_rpc_async_jobs.exceptions import (
13-
BaseAsyncjobRpcError,
1412
JobAbortedError,
1513
JobError,
1614
JobNotDoneError,
1715
JobSchedulerError,
1816
)
19-
from pytest_mock import MockerFixture, MockType
20-
from pytest_simcore.helpers.async_jobs_server import AsyncJobSideEffects
17+
from pytest_mock import MockType
2118
from simcore_service_api_server.models.schemas.base import ApiServerEnvelope
2219

2320
pytest_simcore_core_services_selection = ["postgres", "rabbit"]
@@ -26,47 +23,6 @@
2623
_faker = Faker()
2724

2825

29-
@pytest.fixture
30-
async def async_jobs_rpc_side_effects(
31-
async_job_error: BaseAsyncjobRpcError | None,
32-
) -> Any:
33-
return AsyncJobSideEffects(exception=async_job_error)
34-
35-
36-
@pytest.fixture
37-
def mocked_async_jobs_rpc_api(
38-
mocker: MockerFixture,
39-
async_jobs_rpc_side_effects: Any,
40-
mocked_app_dependencies: None,
41-
) -> dict[str, MockType]:
42-
"""
43-
Mocks the catalog's simcore service RPC API for testing purposes.
44-
"""
45-
from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
46-
47-
mocks = {}
48-
49-
# Get all callable methods from the side effects class that are not built-ins
50-
side_effect_methods = [
51-
method_name
52-
for method_name in dir(async_jobs_rpc_side_effects)
53-
if not method_name.startswith("_")
54-
and callable(getattr(async_jobs_rpc_side_effects, method_name))
55-
]
56-
57-
# Create mocks for each method in catalog_rpc that has a corresponding side effect
58-
for method_name in side_effect_methods:
59-
assert hasattr(async_jobs, method_name)
60-
mocks[method_name] = mocker.patch.object(
61-
async_jobs,
62-
method_name,
63-
autospec=True,
64-
side_effect=getattr(async_jobs_rpc_side_effects, method_name),
65-
)
66-
67-
return mocks
68-
69-
7026
@pytest.mark.parametrize(
7127
"expected_status_code",
7228
[status.HTTP_200_OK],

0 commit comments

Comments
 (0)