fixeed cli tests

Author: Andrei Neagu

packages/service-library/src/servicelib/redis/_client.py

@@ -29,6 +29,17 @@
 _HEALTHCHECK_TASK_TIMEOUT_S: Final[float] = 3.0
 
 
+@tenacity.retry(
+    wait=tenacity.wait_fixed(2),
+    stop=tenacity.stop_after_delay(20),
+    before_sleep=tenacity.before_sleep_log(_logger, logging.INFO),
+    reraise=True,
+)
+async def wait_till_redis_is_responsive(client: aioredis.Redis) -> None:
+    if not await client.ping():
+        raise tenacity.TryAgain
+
+
 @dataclass
 class RedisClientSDK:
     redis_dsn: str
@@ -63,16 +74,6 @@ def __post_init__(self) -> None:
         self._is_healthy = False
         self._health_check_task_started_event = asyncio.Event()
 
-    @tenacity.retry(
-        wait=tenacity.wait_fixed(2),
-        stop=tenacity.stop_after_delay(20),
-        before_sleep=tenacity.before_sleep_log(_logger, logging.INFO),
-        reraise=True,
-    )
-    async def wait_till_redis_is_responsive(self) -> None:
-        if not await self.ping():
-            raise tenacity.TryAgain
-
     async def setup(self) -> None:
         @periodic(interval=self.health_check_interval)
         async def _periodic_check_health() -> None:
@@ -89,7 +90,7 @@ async def _periodic_check_health() -> None:
         # - ensure redis is working
         # - before shutting down an initialized Redis connection it must
         #   make at least one call to the server, otherwise tests might hang
-        await self.wait_till_redis_is_responsive()
+        await wait_till_redis_is_responsive(self._client)
 
         _logger.info(
             "Connection to %s succeeded with %s",

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py

@@ -164,7 +164,9 @@ def _get_environment_variables(
         "RABBIT_PORT": f"{rabbit_settings.RABBIT_PORT}",
         "RABBIT_USER": f"{rabbit_settings.RABBIT_USER}",
         "RABBIT_SECURE": f"{rabbit_settings.RABBIT_SECURE}",
-        "REDIS_SETTINGS": redis_settings.model_dump_json(),
+        "REDIS_SETTINGS": json_dumps(
+            model_dump_with_secrets(redis_settings, show_secrets=True)
+        ),
         "DY_DEPLOYMENT_REGISTRY_SETTINGS": (
             json_dumps(
                 model_dump_with_secrets(

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/cli.py

@@ -11,6 +11,7 @@
 
 from ._meta import PROJECT_NAME
 from .core.application import create_base_app
+from .core.rabbitmq import setup_rabbitmq
 from .core.settings import ApplicationSettings
 from .modules.long_running_tasks import task_ports_outputs_push, task_save_state
 from .modules.mounted_fs import MountedVolumes, setup_mounted_fs
@@ -39,6 +40,7 @@ async def _initialized_app() -> AsyncIterator[FastAPI]:
     app = create_base_app()
 
     # setup MountedVolumes
+    setup_rabbitmq(app)
     setup_mounted_fs(app)
     setup_outputs(app)
 

services/dynamic-sidecar/tests/unit/test_api_rest_workflow_service_metrics.py

@@ -36,7 +36,6 @@
 from servicelib.fastapi.long_running_tasks.client import setup as client_setup
 from servicelib.long_running_tasks.errors import TaskExceptionError
 from servicelib.long_running_tasks.models import TaskId
-from settings_library.redis import RedisSettings
 from simcore_service_dynamic_sidecar._meta import API_VTAG
 from simcore_service_dynamic_sidecar.core.docker_utils import get_container_states
 from simcore_service_dynamic_sidecar.models.schemas.containers import (
@@ -48,11 +47,6 @@
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
 
-pytest_simcore_core_services_selection = [
-    "redis",
-]
-
-
 _FAST_STATUS_POLL: Final[float] = 0.1
 _CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
 _BASE_HEART_BEAT_INTERVAL: Final[float] = 0.1
@@ -89,7 +83,6 @@ def backend_url() -> AnyHttpUrl:
 @pytest.fixture
 def mock_environment(
     mock_postgres_check: None,
-    redis_service: RedisSettings,
     monkeypatch: pytest.MonkeyPatch,
     mock_rabbitmq_envs: EnvVarsDict,
 ) -> EnvVarsDict:

services/dynamic-sidecar/tests/unit/test_cli.py

@@ -1,11 +1,13 @@
 # pylint: disable=unused-argument
 # pylint: disable=redefined-outer-name
-
+import json
 import os
 import traceback
+from pprint import pprint
 
 import pytest
 from click.testing import Result
+from common_library.serialization import model_dump_with_secrets
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from settings_library.rabbit import RabbitSettings
@@ -25,6 +27,14 @@ def cli_runner(
     redis_service: RedisSettings,
     mock_environment: EnvVarsDict,
 ) -> CliRunner:
+    mock_environment["REDIS_SETTINGS"] = json.dumps(
+        model_dump_with_secrets(redis_service, show_secrets=True)
+    )
+    mock_environment["RABBIT_SETTINGS"] = json.dumps(
+        model_dump_with_secrets(rabbit_service, show_secrets=True)
+    )
+
+    pprint(mock_environment)
     return CliRunner(env=mock_environment)