Skip to content

Commit f883dfe

Browse files
author
Andrei Neagu
committed
fixed in memory long running tasks for tests
1 parent 28e56ed commit f883dfe

File tree

5 files changed

+23
-5
lines changed

5 files changed

+23
-5
lines changed
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
1+
# pylint: disable=unused-argument
2+
3+
import functools
4+
15
import pytest
26
from pytest_mock import MockerFixture
37
from servicelib.long_running_tasks import task
48
from servicelib.long_running_tasks._store.in_memory import InMemoryStore
59

610

11+
def _mock_decorator_with_args(*decorator_args, **decorator_kwargs):
12+
def decorator(func):
13+
@functools.wraps(func)
14+
async def wrapper(*func_args, **func_kwargs):
15+
return await func(*func_args, **func_kwargs)
16+
17+
return wrapper
18+
19+
return decorator
20+
21+
722
@pytest.fixture
8-
def uese_in_memory_lonng_running_tasks_storage(mocker: MockerFixture) -> None:
23+
def uese_in_memory_lonng_running_tasks(mocker: MockerFixture) -> None:
924
mocker.patch.object(task, "RedisStore", InMemoryStore)
25+
# for testing the exclsive is not required so it's disabled
26+
mocker.patch.object(task, "exclusive", _mock_decorator_with_args)

services/director-v2/tests/unit/test_api_route_dynamic_scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
@pytest.fixture
2929
def mock_env(
30-
uese_in_memory_lonng_running_tasks_storage: None,
30+
uese_in_memory_lonng_running_tasks: None,
3131
mock_exclusive: None,
3232
disable_rabbitmq: None,
3333
disable_postgres: None,

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ async def _assert_get_dynamic_services_mocked(
124124

125125
@pytest.fixture
126126
def mock_env(
127-
uese_in_memory_lonng_running_tasks_storage: None,
127+
uese_in_memory_lonng_running_tasks: None,
128128
mock_exclusive: None,
129129
disable_postgres: None,
130130
disable_rabbitmq: None,

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_task.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
@pytest.fixture
4545
def mock_env(
46-
uese_in_memory_lonng_running_tasks_storage: None,
46+
uese_in_memory_lonng_running_tasks: None,
4747
disable_postgres: None,
4848
disable_rabbitmq: None,
4949
mock_env: EnvVarsDict,

services/dynamic-sidecar/tests/conftest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def mock_rabbit_check(mocker: MockerFixture) -> None:
169169

170170
@pytest.fixture
171171
def base_mock_envs(
172+
uese_in_memory_lonng_running_tasks: None,
172173
dy_volumes: Path,
173174
shared_store_dir: Path,
174175
compose_namespace: str,
@@ -210,7 +211,7 @@ def base_mock_envs(
210211

211212
@pytest.fixture
212213
def mock_environment(
213-
uese_in_memory_lonng_running_tasks_storage: None,
214+
uese_in_memory_lonng_running_tasks: None,
214215
mock_storage_check: None,
215216
mock_postgres_check: None,
216217
mock_rabbit_check: None,

0 commit comments

Comments
 (0)