Add a test remove channel

Author: jacomago

client/demoApp/Db/Makefile

@@ -13,6 +13,7 @@ include $(TOP)/configure/CONFIG
 DB += somerecords.db
 DB += test_base.db
 DB += test_remove_infotag.db
+DB += test_remove_channel.db
 #----------------------------------------------------
 # If <anyname>.db template is not named <anyname>*.template add
 # <anyname>_template = <templatename>

client/demoApp/Db/test_base.db

@@ -9,3 +9,9 @@ record(longout, "$(P)lo:base_record") {
   info("hello", "world")
   info("archive", "default")
 }
+
+record(longout, "$(P)lo:base_pv2") {
+  info("test", "testing")
+  info("hello", "world")
+  info("archive", "default")
+}

client/demoApp/Db/test_remove_channel.db

@@ -0,0 +1,11 @@
+
+record(ai, "$(P)ai:base_record") {
+  info("test", "testing")
+  info("archive", "MONITOR@1")
+}
+
+record(longout, "$(P)lo:base_record") {
+  info("test", "testing")
+  info("hello", "world")
+  info("archive", "default")
+}

client/demoApp/Db/test_remove_infotag.db

@@ -8,3 +8,9 @@ record(longout, "$(P)lo:base_record") {
   info("hello", "world")
   info("archive", "default")
 }
+
+record(longout, "$(P)lo:base_pv2") {
+  info("test", "testing")
+  info("hello", "world")
+  info("archive", "default")
+}

client/iocBoot/iocdemo/st_remove_channel.cmd

@@ -0,0 +1,31 @@
+#!../../bin/linux-x86_64-debug/demo
+
+## You may have to change demo to something else
+## everywhere it appears in this file
+
+< envPaths
+
+## Register all support components
+dbLoadDatabase("../../dbd/demo.dbd",0,0)
+demo_registerRecordDeviceDriver(pdbbase)
+
+var(reccastTimeout, 5.0)
+var(reccastMaxHoldoff, 5.0)
+
+epicsEnvSet("IOCNAME", "$(IOCSH_NAME)")
+epicsEnvSet("ENGINEER", "myself")
+epicsEnvSet("LOCATION", "myplace")
+
+epicsEnvSet("CONTACT", "mycontact")
+epicsEnvSet("BUILDING", "mybuilding")
+epicsEnvSet("SECTOR", "mysector")
+
+addReccasterEnvVars("CONTACT", "SECTOR")
+addReccasterEnvVars("BUILDING")
+
+## Load record instances
+dbLoadRecords("../../db/reccaster.db", "P=$(IOCSH_NAME):")
+dbLoadRecords("../../db/somerecords.db","P=$(IOCSH_NAME):")
+dbLoadRecords("../../db/test_remove_channel.db", "P=$(IOCSH_NAME):")
+
+iocInit()

server/tests/test_bash_ioc.py

@@ -19,6 +19,7 @@
     encoding="utf-8",
 )
 
+BASE_CHANNEL_COUNT = 9
 setup_compose = ComposeFixtureFactory(Path("docker") / Path("test-bash-ioc.yml")).return_fixture()
 
 
@@ -39,7 +40,6 @@ def stream_logs(exec_result, cmd: str):
     )
     log_thread.start()
 
-
 def start_ioc(setup_compose: DockerCompose) -> Container:
     ioc_container = setup_compose.get_container("ioc1-1")
     docker_client = DockerClient()
@@ -75,7 +75,7 @@ def test_remove_infotag(self, setup_compose: DockerCompose) -> None:  # noqa: F8
         # Arrange
         docker_ioc = start_ioc(setup_compose)
         LOG.info("Waiting for channels to sync")
-        cf_client = create_client_and_wait(setup_compose, expected_channel_count=8)
+        cf_client = create_client_and_wait(setup_compose, expected_channel_count=BASE_CHANNEL_COUNT)
 
         # Check before
         LOG.debug('Checking ioc1-1 has ai:base_record with info tag "archive"')
@@ -94,3 +94,28 @@ def get_len_archive_properties(base_channel):
         base_channel = cf_client.find(name=base_channel_name)
         LOG.debug("archive channel: %s", base_channel)
         assert get_len_archive_properties(base_channel) == 0
+
+
+class TestRemoveChannel:
+    def test_remove_channel(self, setup_compose: DockerCompose) -> None:  # noqa: F811
+        """
+        Test that removing a channel works correctly.
+        """
+        # Arrange
+        docker_ioc = start_ioc(setup_compose)
+        LOG.info("Waiting for channels to sync")
+        cf_client = create_client_and_wait(setup_compose, expected_channel_count=BASE_CHANNEL_COUNT)
+
+        # Check ioc1-1 has base channel
+        LOG.debug('Checking ioc1-1 has ai:base_record2"')
+        base_channel_name = "IOC1-1:ai:base_record"
+        base_channel_test_name = "IOC1-1:ai:base_record2"
+        check_channel_property(cf_client, name=base_channel_name)
+        check_channel_property(cf_client, name=base_channel_test_name)
+
+        # Act
+        restart_ioc(docker_ioc, cf_client, base_channel_name, "st_remove_channel")
+
+        # Assert
+        check_channel_property(cf_client, name=base_channel_name)
+        check_channel_property(cf_client, name=base_channel_test_name, prop=INACTIVE_PROPERTY)