Skip to content

Commit 4e09ac3

Browse files
committed
use pytest-simcore fixture
1 parent 7b5cda8 commit 4e09ac3

File tree

1 file changed

+6
-8
lines changed
  • services/api-server/tests/unit/api_functions/celery

1 file changed

+6
-8
lines changed

services/api-server/tests/unit/api_functions/celery/conftest.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@
2121
)
2222
from celery.worker.worker import WorkController # pylint: disable=no-name-in-module
2323
from celery_library.signals import on_worker_init, on_worker_shutdown
24-
from fakeredis.aioredis import FakeRedis
2524
from pytest_mock import MockerFixture
2625
from pytest_simcore.helpers.monkeypatch_envs import delenvs_from_dict, setenvs_from_dict
2726
from pytest_simcore.helpers.typing_env import EnvVarsDict
2827
from servicelib.fastapi.celery.app_server import FastAPIAppServer
28+
from settings_library.redis import RedisSettings
2929
from simcore_service_api_server.celery_worker.worker_main import setup_worker_tasks
3030
from simcore_service_api_server.core.application import create_app
3131
from simcore_service_api_server.core.settings import ApplicationSettings
3232

33+
pytest_plugins = [
34+
"pytest_simcore.redis_service",
35+
]
36+
3337

3438
@pytest.fixture(scope="session")
3539
def celery_config() -> dict[str, Any]:
@@ -47,12 +51,6 @@ def celery_config() -> dict[str, Any]:
4751
}
4852

4953

50-
@pytest.fixture
51-
async def mocked_redis_server(mocker: MockerFixture) -> None:
52-
mock_redis = FakeRedis()
53-
mocker.patch("redis.asyncio.from_url", return_value=mock_redis)
54-
55-
5654
@pytest.fixture
5755
async def mocked_log_streamer_setup(mocker: MockerFixture) -> MockerFixture:
5856
# mock log streamer: He is looking for non-existent queues. Should be solved more elegantly
@@ -76,7 +74,7 @@ def mock_celery_app(mocker: MockerFixture, celery_config: dict[str, Any]) -> Cel
7674
def app_environment(
7775
mock_celery_app: Celery,
7876
mocked_log_streamer_setup: MockerFixture,
79-
mocked_redis_server: None,
77+
use_in_memory_redis: RedisSettings,
8078
monkeypatch: pytest.MonkeyPatch,
8179
app_environment: EnvVarsDict,
8280
rabbit_env_vars_dict: EnvVarsDict,

0 commit comments

Comments
 (0)