From 9f49efa8b212a05ff53d1c0618d4f262eebf39dc Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Thu, 4 Nov 2021 12:01:23 +0100 Subject: [PATCH] L2SS-470: Add APSCT, APSPU and Docker devices to integration tests --- sbin/run_integration_test.sh | 4 ++-- .../integration_test/devices/test_device_apsct.py | 15 +++++++++++++++ .../integration_test/devices/test_device_apspu.py | 15 +++++++++++++++ .../devices/test_device_docker.py | 15 +++++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apsct.py create mode 100644 tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apspu.py create mode 100644 tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_docker.py diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index ee317bf4d..77cacad89 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -15,7 +15,7 @@ cd "$LOFAR20_DIR/docker-compose" || exit 1 make build # Start and stop sequence -make stop device-boot device-sdp device-recv device-sst device-unb2 device-xst sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim +make stop device-boot device-docker device-apsct device-apspu device-sdp device-recv device-sst device-unb2 device-xst sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim make start databaseds dsconfig elk # Give dsconfig and databaseds time to start @@ -32,7 +32,7 @@ make start sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim # Give the simulators time to start sleep 5 -make start device-boot device-sdp device-recv device-sst device-unb2 device-xst +make start device-boot device-docker device-apsct device-apspu device-sdp device-recv device-sst device-unb2 device-xst # Give devices time to restart # TODO(Corne Lukken): Use a nicer more reliable mechanism diff --git a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apsct.py b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apsct.py new file mode 100644 index 000000000..ca73fc236 --- /dev/null +++ b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apsct.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# +# This file is part of the LOFAR 2.0 Station Software +# +# +# +# Distributed under the terms of the APACHE license. +# See LICENSE.txt for more info. + +from .base import AbstractTestBases + +class TestDeviceAPSCT(AbstractTestBases.TestDeviceBase): + + def setUp(self): + super().setUp("STAT/APSCT/1") diff --git a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apspu.py b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apspu.py new file mode 100644 index 000000000..b9d2bc3d4 --- /dev/null +++ b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_apspu.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# +# This file is part of the LOFAR 2.0 Station Software +# +# +# +# Distributed under the terms of the APACHE license. +# See LICENSE.txt for more info. + +from .base import AbstractTestBases + +class TestDeviceAPSPU(AbstractTestBases.TestDeviceBase): + + def setUp(self): + super().setUp("STAT/APSPU/1") diff --git a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_docker.py b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_docker.py new file mode 100644 index 000000000..6c3fdf94b --- /dev/null +++ b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_docker.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# +# This file is part of the LOFAR 2.0 Station Software +# +# +# +# Distributed under the terms of the APACHE license. +# See LICENSE.txt for more info. + +from .base import AbstractTestBases + +class TestDeviceDocker(AbstractTestBases.TestDeviceBase): + + def setUp(self): + super().setUp("STAT/Docker/1") -- GitLab