Cover case where ioc stops while channelfinder down

Author: jacomago

server/tests/docker.py

@@ -42,14 +42,23 @@ def setup_compose():
     compose.stop()
 
 
-def restart_container(compose: DockerCompose, host_name: str) -> None:
+def restart_container(compose: DockerCompose, host_name: str) -> str:
     container = compose.get_container(host_name)
     docker_client = DockerClient()
     docker_client.containers.get(container.ID).stop()
     docker_client.containers.get(container.ID).start()
+    return container.ID
 
 
-def shutdown_container(compose: DockerCompose, host_name: str) -> None:
+def shutdown_container(compose: DockerCompose, host_name: str) -> str:
     container = compose.get_container(host_name)
     docker_client = DockerClient()
     docker_client.containers.get(container.ID).stop()
+    return container.ID
+
+
+def start_container(compose: DockerCompose, host_name: str | None = None, container_id: str | None = None) -> None:
+    container_id = container_id or compose.get_container(host_name).ID
+    if container_id:
+        docker_client = DockerClient()
+        docker_client.containers.get(container_id).start()

server/tests/test_restart.py

@@ -1,4 +1,5 @@
 import logging
+import time
 
 import pytest
 from channelfinder import ChannelFinderClient
@@ -11,7 +12,7 @@
     create_client_and_wait,
     wait_for_sync,
 )
-from .docker import restart_container, setup_compose, shutdown_container  # noqa: F401
+from .docker import restart_container, setup_compose, shutdown_container, start_container  # noqa: F401
 
 PROPERTIES_TO_MATCH = ["pvStatus", "recordType", "recordDesc", "alias", "hostName", "iocName", "recceiverID"]
 
@@ -62,16 +63,44 @@ def check_connection_active(cf_client: ChannelFinderClient) -> bool:
 
 
 class TestRestartChannelFinder:
-    def test_channels_same_after_restart(self, setup_compose: DockerCompose, cf_client: ChannelFinderClient) -> None:  # noqa: F811
-        channels_begin = cf_client.find(name="*")
+    def test_status_property_works_after_cf_restart(
+        self,
+        setup_compose: DockerCompose,  # noqa: F811
+        cf_client: ChannelFinderClient,
+    ) -> None:
+        # Arrange
+        # Act
         restart_container(setup_compose, "cf")
         assert wait_for_sync(cf_client, check_connection_active)
-        channels_end = cf_client.find(name="*")
-        assert len(channels_begin) == len(channels_end)
-        channels_match(channels_begin, channels_end, PROPERTIES_TO_MATCH)
+
+        # Assert
         shutdown_container(setup_compose, "ioc1-1")
         assert wait_for_sync(
             cf_client, lambda cf_client: check_channel_property(cf_client, "IOC1-1:Msg-I", INACTIVE_PROPERTY)
         )
         channels_inactive = cf_client.find(property=[("iocName", "IOC1-1")])
         assert all(INACTIVE_PROPERTY in ch["properties"] for ch in channels_inactive)
+
+
+class TestShutdownChannelFinder:
+    def test_status_property_works_between_cf_down(
+        self,
+        setup_compose: DockerCompose,  # noqa: F811
+        cf_client: ChannelFinderClient,
+    ) -> None:
+        # Arrange
+        cf_container_id = shutdown_container(setup_compose, "cf")
+        time.sleep(10)  # Wait to ensure CF is down while IOC is down
+
+        # Act
+        shutdown_container(setup_compose, "ioc1-1")
+        time.sleep(10)  # Wait to ensure CF is down while IOC is down
+        start_container(setup_compose, container_id=cf_container_id)
+        assert wait_for_sync(cf_client, check_connection_active)
+
+        # Assert
+        assert wait_for_sync(
+            cf_client, lambda cf_client: check_channel_property(cf_client, "IOC1-1:Msg-I", INACTIVE_PROPERTY)
+        )
+        channels_inactive = cf_client.find(property=[("iocName", "IOC1-1")])
+        assert all(INACTIVE_PROPERTY in ch["properties"] for ch in channels_inactive)