Refactor docker ioc used in testing recceiver

client/demoApp/Db/Makefile

@@ -11,8 +11,6 @@ include $(TOP)/configure/CONFIG
 # Create and install (or just install) into <top>/db
 # databases, templates, substitutions like this
 DB += somerecords.db
-DB += archive.db
-DB += archive_bugtest.db
 #----------------------------------------------------
 # If <anyname>.db template is not named <anyname>*.template add
 # <anyname>_template = <templatename>

client/iocBoot/iocdemo/st.cmd

@@ -29,6 +29,5 @@ addReccasterExcludePattern("*exclude_this")
 ## Load record instances
 dbLoadRecords("../../db/reccaster.db", "P=$(IOCSH_NAME):")
 dbLoadRecords("../../db/somerecords.db","P=$(IOCSH_NAME):")
-dbLoadRecords("../../db/archive.db", "P=$(IOCSH_NAME):")
 
 iocInit()

server/tests/client_checks.py

@@ -11,6 +11,7 @@
 INACTIVE_PROPERTY = {"name": "pvStatus", "owner": "admin", "value": "Inactive", "channels": []}
 MAX_WAIT_SECONDS = 180
 TIME_PERIOD_INCREMENT = 2
+DEFAULT_CHANNEL_NAME = "IOC1-1:ai:test"
 
 
 def channel_match(channel0, channel1, properties_to_match: list[str]):
@@ -28,7 +29,7 @@ def channels_match(channels_begin, channels_end, properties_to_match: list[str])
         channel_match(channel, channels_end[channel_index], properties_to_match)
 
 
-def check_channel_count(cf_client: ChannelFinderClient, name="*", expected_channel_count=24):
+def check_channel_count(cf_client: ChannelFinderClient, expected_channel_count, name="*"):
     channels = cf_client.find(name=name)
     LOG.debug("Found %s channels", len(channels))
     return len(channels) == expected_channel_count
@@ -52,7 +53,7 @@ def wait_for_sync(cf_client: ChannelFinderClient, check: Callable[[ChannelFinder
     return False
 
 
-def create_client_and_wait(compose: DockerCompose, expected_channel_count=24) -> ChannelFinderClient:
+def create_client_and_wait(compose: DockerCompose, expected_channel_count) -> ChannelFinderClient:
     LOG.info("Waiting for channels to sync")
     cf_client = create_client_from_compose(compose)
     assert wait_for_sync(

server/docker/test-bash-ioc.yml → server/tests/docker/test-bash-ioc.yml

@@ -1,10 +1,10 @@
 name: test-bash-ioc
 include:
-  - cf-compose.yml
+  - ../../docker/cf-compose.yml
 services:
   recc1:
     extends:
-      file: ../compose.yml
+      file: ../../compose.yml
       service: recc
     depends_on:
       cf:
@@ -16,7 +16,7 @@ services:
       - net-2-cf
   ioc1-1:
     extends:
-      file: ../../client/ioc-compose.yml
+      file: ../../../client/ioc-compose.yml
       service: ioc1
     environment:
       - IOCSH_NAME=IOC1-1
@@ -28,7 +28,17 @@ services:
     command: bash
     networks:
       - net-1-recc-1
+    volumes:
+      - ioc:/ioc
 
 networks:
   net-1-recc-1:
     driver: bridge
+
+volumes:
+  ioc:
+    driver: local
+    driver_opts:
+      type: none
+      device: ../ioc
+      o: bind

server/docker/test-multi-recc.yml → server/tests/docker/test-multi-recc.yml

@@ -1,10 +1,10 @@
 name: test-multi-recc
 include:
-  - cf-compose.yml
+  - ../../docker/cf-compose.yml
 services:
   recc1:
     extends:
-      file: ../compose.yml
+      file: ../../compose.yml
       service: recc
     depends_on:
       cf:
@@ -16,7 +16,7 @@ services:
       - net-2-cf
   ioc1-1:
     extends:
-      file: ../../client/ioc-compose.yml
+      file: ../../../client/ioc-compose.yml
       service: ioc1
     depends_on:
       recc1:
@@ -27,6 +27,9 @@ services:
     hostname: ioc1-1
     networks:
       - net-1-recc-1
+    command: ./demo /ioc/st.cmd
+    volumes:
+      - ioc:/ioc
   ioc1-2:
     extends:
       ioc1-1
@@ -72,3 +75,11 @@ networks:
     driver: bridge
   net-1-recc-2:
     driver: bridge
+
+volumes:
+  ioc:
+    driver: local
+    driver_opts:
+      type: none
+      device: ../ioc
+      o: bind

server/docker/test-single-ioc.yml → server/tests/docker/test-single-ioc.yml

@@ -1,10 +1,10 @@
 name: test-single-ioc
 include:
-  - cf-compose.yml
+  - ../../docker/cf-compose.yml
 services:
   recc1:
     extends:
-      file: ../compose.yml
+      file: ../../compose.yml
       service: recc
     depends_on:
       cf:
@@ -16,7 +16,7 @@ services:
       - net-2-cf
   ioc1-1:
     extends:
-      file: ../../client/ioc-compose.yml
+      file: ../../../client/ioc-compose.yml
       service: ioc1
     depends_on:
       recc1:
@@ -27,7 +27,18 @@ services:
     hostname: ioc1-1
     networks:
       - net-1-recc-1
+    command: ./demo /ioc/st.cmd
+    volumes:
+      - ioc:/ioc
 
 networks:
   net-1-recc-1:
     driver: bridge
+
+volumes:
+  ioc:
+    driver: local
+    driver_opts:
+      type: none
+      device: ../ioc
+      o: bind

server/tests/ioc/st.cmd

@@ -0,0 +1,13 @@
+## Register all support components
+dbLoadDatabase("/recsync/dbd/demo.dbd",0,0)
+demo_registerRecordDeviceDriver(pdbbase)
+
+var(reccastTimeout, 5.0)
+var(reccastMaxHoldoff, 5.0)
+
+epicsEnvSet("IOCNAME", "$(IOCSH_NAME)")
+
+## Load record instances
+dbLoadRecords("/ioc/$(DB_FILE=test.db)","P=$(IOCSH_NAME):")
+
+iocInit()

server/tests/ioc/test.db

@@ -0,0 +1,7 @@
+
+record(ai, "$(P)ai:test") {
+  alias("$(P)ai:test:alias")
+  info("test", "testing")
+  info("archive", "MONITOR@1")
+  field(DESC, "testdesc")
+}