Merge pull request #127 from ChannelFinder/pullout-server-test-docker

Refactor docker ioc used in testing recceiver

Author: jacomago

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/demoApp/Db/archive.db

@@ -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()

client/demoApp/Db/archive_bugtest.db

@@ -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(