fix: redis connection in e2e tests

Author: d-perl

.github/actions/bec_e2e_install/action.yml

@@ -62,7 +62,7 @@ runs:
         cd ./_e2e_test_checkout_/bec
         source ./bin/install_bec_dev.sh -t
         pip install -e ../ophyd_devices
-        podman pod create --add-host redis:host-gateway local_bec
+        podman pod create --net host local_bec
         python ./bec_ipython_client/tests/end-2-end/_ensure_requirements_container.py
         pytest -v --files-path ./ --start-servers --random-order  ./bec_ipython_client/tests/end-2-end/
         

bec_ipython_client/tests/end-2-end/test_procedures_e2e.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import time
+from dataclasses import dataclass
 from importlib.metadata import version
 from typing import TYPE_CHECKING, Callable, Generator
 from unittest.mock import MagicMock, patch
@@ -11,6 +12,7 @@
 from bec_lib import messages
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
+from bec_server.scan_server.procedures.constants import _CONTAINER, _WORKER
 from bec_server.scan_server.procedures.container_utils import get_backend
 from bec_server.scan_server.procedures.container_worker import ContainerProcedureWorker
 from bec_server.scan_server.procedures.manager import ProcedureManager
@@ -27,6 +29,15 @@
 pytestmark = pytest.mark.random_order(disabled=True)
 
 
+@dataclass(frozen=True)
+class PATCHED_CONSTANTS:
+    WORKER = _WORKER()
+    CONTAINER = _CONTAINER()
+    MANAGER_SHUTDOWN_TIMEOUT_S = 2
+    BEC_VERSION = version("bec_lib")
+    REDIS_HOST = "localhost"
+
+
 @pytest.fixture
 def client_logtool_and_manager(
     bec_ipython_client_fixture_with_logtool: tuple[BECIPythonClient, "LogTestTool"],
@@ -84,6 +95,7 @@ def cb(worker: ContainerProcedureWorker):
 
 @pytest.mark.timeout(100)
 @patch("bec_server.scan_server.procedures.manager.procedure_registry.is_registered", lambda _: True)
+@patch("bec_server.scan_server.procedures.container_worker.PROCEDURE", PATCHED_CONSTANTS())
 def test_happy_path_container_procedure_runner(
     client_logtool_and_manager: tuple[BECIPythonClient, "LogTestTool", ProcedureManager],
 ):
@@ -103,7 +115,6 @@ def test_happy_path_container_procedure_runner(
 
     logtool.fetch()
     assert logtool.is_present_in_any_message("procedure accepted: True, message:")
-    assert "test string" in "\n".join(manager._logs)
     assert logtool.is_present_in_any_message(
         "ContainerWorker started container for queue primary"
     ), f"Log content relating to procedures: {manager}"

bec_server/bec_server/scan_server/procedures/constants.py

@@ -67,6 +67,7 @@ class _PROCEDURE:
     CONTAINER = _CONTAINER()
     MANAGER_SHUTDOWN_TIMEOUT_S = 2
     BEC_VERSION = version("bec_lib")
+    REDIS_HOST = "redis"
 
 
 PROCEDURE = _PROCEDURE()

bec_server/bec_server/scan_server/procedures/container_worker.py

@@ -61,7 +61,7 @@ def _worker_environment(self) -> ContainerWorkerEnv:
         minimum necessary, or things which are only necessary for the functioning of the worker,
         and other information should be passed through redis"""
         return {
-            "redis_server": f"redis:{self._conn.port}",
+            "redis_server": f"{PROCEDURE.REDIS_HOST}:{self._conn.port}",
             "queue": self._queue,
             "timeout_s": str(self._lifetime_s),
         }