Skip to content
Snippets Groups Projects
Commit b0c02ea0 authored by Stefano Di Frischia's avatar Stefano Di Frischia
Browse files

L2SS-958: fix configdb conflicts

parent 8baacd38
No related branches found
No related tags found
1 merge request!435L2SS-958: fix configdb conflicts
......@@ -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"
]
}
}
......
......@@ -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"
]
......
......@@ -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")]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment