Switch to Sinq CI

test/ioc.sh

@@ -5,4 +5,4 @@ export EPICS_BASE=/usr/local/epics/base-7.0.7
 
 PARENT_PATH="$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )"
 
-"${PARENT_PATH}/st.cmd"
+/usr/local/bin/procServ -L - -f -i ^D^C 20001 "${PARENT_PATH}/st.cmd"

test/st.cmd

@@ -9,6 +9,6 @@ epicsEnvSet("PREFIX","SQ:TEST")
 epicsEnvSet("NAME","CB_TEST")
 
 epicsEnvSet("SET_SIM_MODE","") # Run Counterbox Simulation Instead of Actual Box
-runScript "$(counterbox_DIR)counterbox_v2.cmd" "CNTBOX_IP=localhost, CNTBOX_PORT=2000"
+runScript "$(counterbox_DIR)counterbox_v2.cmd" "CNTBOX_IP=127.0.0.1, CNTBOX_PORT=2000"
 
 iocInit()

test/test.py

@@ -87,7 +87,7 @@ def testCanCount(prefix, name):
 def test(prefix, name):
 
     # TODO pass prefix and name to script
-    proc = Popen([f'{os.environ["PARENT_PATH"]}/st.cmd'], stdout=PIPE, stderr=PIPE, shell=False)
+    proc = Popen([f'{os.environ["PARENT_PATH"]}/ioc.sh'], stdout=PIPE, stderr=PIPE, shell=False)
 
     try:
         stdqueue, errqueue = get_piped_output(proc)
@@ -99,6 +99,11 @@ def test(prefix, name):
             if 'iocRun: All initialization complete' in line:
                 break # IOC is now running
 
+        #time.sleep(20)
+
+        print("IOC Initialisation Complete")
+        print("Starting Tests")
+
         testCanCount(prefix, name)
 
         print("Success")