repalced with inmemory redis

Author: Andrei Neagu

packages/pytest-simcore/src/pytest_simcore/long_running_tasks.py

@@ -1,26 +1,9 @@
-# pylint: disable=unused-argument
-
-import functools
-
 import pytest
+from fakeredis import FakeAsyncRedis
 from pytest_mock import MockerFixture
-from servicelib.long_running_tasks import task
-from servicelib.long_running_tasks._store.in_memory import InMemoryStore
-
-
-def _mock_decorator_with_args(*decorator_args, **decorator_kwargs):
-    def decorator(func):
-        @functools.wraps(func)
-        async def wrapper(*func_args, **func_kwargs):
-            return await func(*func_args, **func_kwargs)
-
-        return wrapper
-
-    return decorator
+from servicelib.redis import _client
 
 
 @pytest.fixture
-def use_in_memory_long_running_tasks(mocker: MockerFixture) -> None:
-    mocker.patch.object(task, "RedisStore", InMemoryStore)
-    # for testing the exclsive is not required so it's disabled
-    mocker.patch.object(task, "exclusive", _mock_decorator_with_args)
+async def use_in_memory_redis(mocker: MockerFixture) -> None:
+    mocker.patch.object(_client, "aioredis", FakeAsyncRedis)

services/director-v2/requirements/_test.in

@@ -17,6 +17,7 @@ async-asgi-testclient # replacement for fastapi.testclient.TestClient [see b) be
 dask[distributed,diagnostics]
 docker
 Faker
+fakeredis[lua]
 flaky
 pytest
 pytest-asyncio

services/director-v2/requirements/_test.txt

@@ -99,6 +99,8 @@ execnet==2.1.1
     # via pytest-xdist
 faker==37.3.0
     # via -r requirements/_test.in
+fakeredis==2.30.3
+    # via -r requirements/_test.in
 flaky==3.8.1
     # via -r requirements/_test.in
 frozenlist==1.6.0
@@ -159,6 +161,8 @@ locket==1.0.0
     #   -c requirements/_base.txt
     #   distributed
     #   partd
+lupa==2.5
+    # via fakeredis
 mako==1.3.10
     # via
     #   -c requirements/../../../requirements/constraints.txt
@@ -271,6 +275,11 @@ pyyaml==6.0.2
     #   bokeh
     #   dask
     #   distributed
+redis==6.1.0
+    # via
+    #   -c requirements/../../../requirements/constraints.txt
+    #   -c requirements/_base.txt
+    #   fakeredis
 requests==2.32.4
     # via
     #   -c requirements/_base.txt
@@ -293,6 +302,7 @@ sortedcontainers==2.4.0
     # via
     #   -c requirements/_base.txt
     #   distributed
+    #   fakeredis
 sqlalchemy==1.4.54
     # via
     #   -c requirements/../../../requirements/constraints.txt

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

@@ -27,7 +27,7 @@
 
 @pytest.fixture
 def mock_env(
-    use_in_memory_long_running_tasks: None,
+    use_in_memory_redis: None,
     mock_exclusive: None,
     disable_rabbitmq: None,
     disable_postgres: None,

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

@@ -124,7 +124,7 @@ async def _assert_get_dynamic_services_mocked(
 
 @pytest.fixture
 def mock_env(
-    use_in_memory_long_running_tasks: None,
+    use_in_memory_redis: None,
     mock_exclusive: None,
     disable_postgres: None,
     disable_rabbitmq: None,

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

@@ -43,7 +43,7 @@
 
 @pytest.fixture
 def mock_env(
-    use_in_memory_long_running_tasks: None,
+    use_in_memory_redis: None,
     disable_postgres: None,
     disable_rabbitmq: None,
     mock_env: EnvVarsDict,

services/dynamic-sidecar/tests/conftest.py

@@ -169,7 +169,7 @@ def mock_rabbit_check(mocker: MockerFixture) -> None:
 
 @pytest.fixture
 def base_mock_envs(
-    use_in_memory_long_running_tasks: None,
+    use_in_memory_redis: None,
     dy_volumes: Path,
     shared_store_dir: Path,
     compose_namespace: str,
@@ -211,7 +211,7 @@ def base_mock_envs(
 
 @pytest.fixture
 def mock_environment(
-    use_in_memory_long_running_tasks: None,
+    use_in_memory_redis: None,
     mock_storage_check: None,
     mock_postgres_check: None,
     mock_rabbit_check: None,