From b0c02ea08ef001e5a329c1fcb95ab54a9ef185d6 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Tue, 27 Sep 2022 16:36:44 +0200
Subject: [PATCH] L2SS-958: fix configdb conflicts
---
CDB/LOFAR_ConfigDb.json | 2 +-
CDB/stations/simulators_ConfigDb.json | 4 +---
.../default/devices/test_device_temperature_manager.py | 1 +
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index e7af81cae..dcf8ce83a 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -93,7 +93,7 @@
"RECV, RECV_TEMP_error_R"
],
"Shutdown_Device_List":[
- "STAT/SDP/1", "STAT/UNB2/1", "STAT/RECV/1", "STAT/APSCT/1", "STAT/APSPU/1"
+ "STAT/SDP/1", "STAT/UNB2/1", "STAT/RECV/1", "STAT/APSCT/1", "STAT/CCD/1", "STAT/APSPU/1"
]
}
}
diff --git a/CDB/stations/simulators_ConfigDb.json b/CDB/stations/simulators_ConfigDb.json
index bb686ecf7..b62292ef7 100644
--- a/CDB/stations/simulators_ConfigDb.json
+++ b/CDB/stations/simulators_ConfigDb.json
@@ -140,9 +140,7 @@
"TemperatureManager": {
"STAT/TemperatureManager/1": {
"properties": {
- "Alarm_Error_List": [
- "RECV, HBAT_LED_on_RW"
- ],
+ "Alarm_Error_List": [],
"Shutdown_Device_List":[
"STAT/SDP/1", "STAT/UNB2/1", "STAT/RECV/1", "STAT/APSCT/1", "STAT/CCD/1","STAT/APSPU/1"
]
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
index 3e32310e1..e31697646 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
@@ -48,6 +48,7 @@ class TestDeviceTemperatureManager(AbstractTestBases.TestDeviceBase):
def test_alarm(self):
# Exclude other devices which raise a TimeoutError, since they wait for the attribute *_translator_busy_R to become False
# (set instead to True in this test environment)
+ self.proxy.put_property({"Alarm_Error_List": ["RECV, HBAT_LED_on_RW"]})
self.proxy.put_property({"Shutdown_Device_List": ["STAT/SDP/1"]})
devices = [DeviceProxy("STAT/SDP/1")]
--
GitLab