diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_beamlet.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_beamlet.py index b04808948129dd3f37ab01dd35b149a606483d6d..b5d7c9f85e4051e7bcd1f7bc5482166583fb1939 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_beamlet.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_beamlet.py @@ -41,7 +41,8 @@ class TestDeviceBeamlet(AbstractTestBases.TestDeviceBase): sdp_proxy = self.setup_sdp() self.proxy.initialise() - self.proxy.subband_select = [0] * 488 + # TODO(Corne): Update test so effects of attribute are asserted L2SS-984 + # self.proxy.subband_select_RW = [0] * 488 self.proxy.on() # The subband frequency of HBA subband 0 is 200 MHz, @@ -63,7 +64,8 @@ class TestDeviceBeamlet(AbstractTestBases.TestDeviceBase): sdp_proxy = self.setup_sdp() self.proxy.initialise() - self.proxy.subband_select = list(range(488)) + # TODO(Corne): Update test so effects of attribute are asserted L2SS-984 + # self.proxy.subband_select_RW = list(range(488)) self.proxy.on() # any non-zero delay should result in different weights for different clocks diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py index aed6b32314ddc6a2a69fe3f939a0c7ccaa4b6fda..f905e72ec57463ea5c7a41abc5b5a40c31582303 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_digitalbeam.py @@ -66,8 +66,9 @@ class TestDeviceDigitalBeam(AbstractTestBases.TestDeviceBase): antennafield_proxy.put_property({ "RECV_devices": [self.recv_iden], "Control_to_RECV_mapping": numpy.array(control_mapping).flatten(), - 'Antenna_Quality': antenna_qualities, 'Antenna_Use': antenna_use} - ) + "Antenna_Quality": antenna_qualities, + "Antenna_Use": antenna_use + }) antennafield_proxy.off() antennafield_proxy.boot() return antennafield_proxy @@ -81,9 +82,10 @@ class TestDeviceDigitalBeam(AbstractTestBases.TestDeviceBase): self.setup_antennafield_proxy(self.antenna_qualities_ok, self.antenna_use_ok) self.setup_sdp_proxy() + # TODO(Corne): Update these and ensure their effects is asserted in tests L2SS-984 # Setup beamlet configuration - self.beamlet_proxy.clock_RW = 200 * 1000000 - self.beamlet_proxy.subband_select = list(range(488)) + # self.beamlet_proxy.clock_RW = 200 * 1000000 + # self.beamlet_proxy.subband_select_RW = list(range(488)) self.proxy.initialise() self.proxy.Tracking_enabled_RW = False @@ -106,10 +108,6 @@ class TestDeviceDigitalBeam(AbstractTestBases.TestDeviceBase): self.setup_antennafield_proxy(self.antenna_qualities_ok, self.antenna_use_ok) self.setup_sdp_proxy() - # Setup beamlet configuration - self.beamlet_proxy.clock_RW = 200 * 1000000 - self.beamlet_proxy.subband_select = list(range(488)) - self.proxy.initialise() self.proxy.Tracking_enabled_RW = False self.proxy.on() @@ -140,10 +138,6 @@ class TestDeviceDigitalBeam(AbstractTestBases.TestDeviceBase): self.setup_antennafield_proxy(self.antenna_qualities_ok, self.antenna_use_ok) self.setup_sdp_proxy() - # Setup beamlet configuration - self.beamlet_proxy.clock_RW = 200 * 1000000 - self.beamlet_proxy.subband_select = list(range(488)) - self.proxy.initialise() self.proxy.Tracking_enabled_RW = False self.proxy.on()