From b2d374eb027c9a837de76622b4bd2357874947ee Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Tue, 22 Mar 2022 14:16:29 +0000
Subject: [PATCH] L2SS-484: Flip recv and beam proxy initialization order
---
.../integration_test/recv_cluster/test_recv_cluster.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py b/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py
index 563ae5f8a..898ca8389 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/recv_cluster/test_recv_cluster.py
@@ -34,23 +34,24 @@ class TestRecvCluster(base.IntegrationTestCase):
# Beam / Recv 1,2,3,4
for i in range(1, 5):
- beam_proxies.append(TestDeviceProxy(f"STAT/TileBeam/{i}"))
recv_proxies.append(TestDeviceProxy(f"STAT/RECV/{i}"))
+ beam_proxies.append(TestDeviceProxy(f"STAT/TileBeam/{i}"))
- for proxy in beam_proxies:
+ # Recv devices must be ready before TileBeam
+ for proxy in recv_proxies:
proxy.off()
self.assertTrue(proxy.state() is DevState.OFF)
proxy.initialise()
self.assertTrue(proxy.state() is DevState.STANDBY)
+ proxy.set_defaults()
proxy.on()
self.assertTrue(proxy.state() is DevState.ON)
- for proxy in recv_proxies:
+ for proxy in beam_proxies:
proxy.off()
self.assertTrue(proxy.state() is DevState.OFF)
proxy.initialise()
self.assertTrue(proxy.state() is DevState.STANDBY)
- proxy.set_defaults()
proxy.on()
self.assertTrue(proxy.state() is DevState.ON)
--
GitLab