Merge branch 'master' into L2SS-574-move-hbat-code-to-recv

sbin/run_integration_test.sh

@@ -29,6 +29,7 @@ sleep 60
 # Do not remove `bash`, otherwise statement ignored by gitlab ci shell!
 bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/LOFAR_ConfigDb.json
 bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/stations/simulators_ConfigDb.json
+#bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/integration_ConfigDb.json
 
 cd "$LOFAR20_DIR/docker-compose" || exit 1
 make start sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim
@@ -44,10 +45,7 @@ sleep 60
 
 # Start the integration test
 cd "$LOFAR20_DIR/docker-compose" || exit 1
-make start integration-test
-
-# Give devices time to restart
-sleep 60
+make up integration-test
 
 # Run the integration test with the output displayed on stdout
 docker start -a "${CONTAINER_NAME_PREFIX}"integration-test

tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py

@@ -7,6 +7,7 @@
 # Distributed under the terms of the APACHE license.
 # See LICENSE.txt for more info.
 
+import time
 import numpy
 from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
 
@@ -47,6 +48,8 @@ class TestDeviceBeam(AbstractTestBases.TestDeviceBase):
         # HBAT_bf_delay_step_delays = recv_proxy.get_hbat_bf_delay_step_delays()
         # HBAT_bf_delays = self.proxy._calculate_HBAT_bf_delays(HBAT_delays, HBAT_signal_input_delays, HBAT_bf_delay_step_delays)
         # self.assertNotEqual(HBAT_delays, HBAT_bf_delays)
+
+        time.sleep(3)
         
         # Verify writing operation does not lead to errors
         self.proxy.HBAT_set_pointing(numpy.array([["J2000","0deg","0deg"]] * 96).flatten())  # write values to RECV