diff --git a/devices/integration_test/README.md b/devices/integration_test/README.md index 55c42d3dfe1cbc6fb034c859f66f95e345822fac..3292bfa0049b5c2312f8e0536e00cc581433ed61 100644 --- a/devices/integration_test/README.md +++ b/devices/integration_test/README.md @@ -7,15 +7,13 @@ container will be build by the makefiles but should only be started by the dedicated integration test script. This script will ensure that other containers are running and are in the required state. -[comment]: <> (#TODO(Corne): Change pypcc-sim name to apsct-sim name once changed!) - * Launch pypcc-sim and sdptr-sim simulators. * Reconfigure dsconfig to use these simulators. * Create and start the integration-test container. ## Running -**Warning running these tests will make changes to your local system!** +**Warning running these tests will make changes to your CDB database config!** ```shell source bootstrap/etc/lofar20rc.sh diff --git a/devices/integration_test/devices/test_device_apsct.py b/devices/integration_test/devices/test_device_pcc.py similarity index 69% rename from devices/integration_test/devices/test_device_apsct.py rename to devices/integration_test/devices/test_device_pcc.py index 8d2d384b7405d15253ffd68e2bbc287a20a6cecb..b3b7a4672dbb18790d19144aeb35bcacd68e4bfb 100644 --- a/devices/integration_test/devices/test_device_apsct.py +++ b/devices/integration_test/devices/test_device_pcc.py @@ -15,10 +15,10 @@ from tango._tango import DevState from integration_test import base -class TestDeviceAPSCT(base.IntegrationTestCase): +class TestDevicePCC(base.IntegrationTestCase): def setUp(self): - super(TestDeviceAPSCT, self).setUp() + super(TestDevicePCC, self).setUp() def tearDown(self): """Turn device Off in teardown to prevent blocking tests""" @@ -28,35 +28,30 @@ class TestDeviceAPSCT(base.IntegrationTestCase): d.Off() except Exception as e: """Failing to turn Off devices should not raise errors here""" - print("Failed to turn device off in teardown %s" % e) + print(f"Failed to turn device off in teardown {e}") - def test_device_proxy_apsct(self): + def test_device_proxy_pcc(self): """Test if we can successfully create a DeviceProxy and fetch state""" - #TODO(Corne): Change name to APSCT once ready d = DeviceProxy("LTS/PCC/1") self.assertEqual(DevState.OFF, d.state()) - def test_device_apsct_initialize(self): + def test_device_pcc_initialize(self): """Test if we can transition to standby""" - # TODO(Corne): Change name to APSCT once ready d = DeviceProxy("LTS/PCC/1") d.initialise() - time.sleep(1) self.assertEqual(DevState.STANDBY, d.state()) - def test_device_apsct_on(self): + def test_device_pcc_on(self): """Test if we can transition to on""" - # TODO(Corne): Change name to APSCT once ready d = DeviceProxy("LTS/PCC/1") d.initialise() - time.sleep(1) d.on() diff --git a/devices/integration_test/devices/test_device_sdp.py b/devices/integration_test/devices/test_device_sdp.py index 040df6c1021fb270590d46072f9269e54ff3665a..cfd656748054cb21e0e3bb2110ce60072d9fb28a 100644 --- a/devices/integration_test/devices/test_device_sdp.py +++ b/devices/integration_test/devices/test_device_sdp.py @@ -29,7 +29,7 @@ class TestDeviceSDP(base.IntegrationTestCase): d.Off() except Exception as e: """Failing to turn Off devices should not raise errors here""" - print("Failed to turn device off in teardown %s" % e) + print(f"Failed to turn device off in teardown {e}") def test_device_proxy_sdp(self): """Test if we can successfully create a DeviceProxy and fetch state""" @@ -44,7 +44,6 @@ class TestDeviceSDP(base.IntegrationTestCase): d = DeviceProxy("LTS/SDP/1") d.initialise() - time.sleep(1) self.assertEqual(DevState.STANDBY, d.state()) @@ -54,7 +53,6 @@ class TestDeviceSDP(base.IntegrationTestCase): d = DeviceProxy("LTS/SDP/1") d.initialise() - time.sleep(1) d.on()