Skip to content
Snippets Groups Projects
Commit 6ca7400f authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

AT5-382: EndSb typo in decorator function.

Removed tests to switch-off the CSP.
Updated release number.
parent b9155b96
No related branches found
No related tags found
No related merge requests found
...@@ -2246,7 +2246,7 @@ class CspSubarray(SKASubarray): ...@@ -2246,7 +2246,7 @@ class CspSubarray(SKASubarray):
# read the timeout attribute configured for this command # read the timeout attribute configured for this command
# if not implemented an AttributeError exception is thrown # if not implemented an AttributeError exception is thrown
# and the default value is used # and the default value is used
self._sc_subarray_cmd_duration_expected[device]['gotoidle'] = proxy.endSBCmdDurationExpected self._sc_subarray_cmd_duration_expected[device]['gotoidle'] = proxy.gotoIdleCmdDurationExpected
except KeyError as key_err: except KeyError as key_err:
self.logger.warning("GoToIdle execution:no key {} found".format(str(key_err))) self.logger.warning("GoToIdle execution:no key {} found".format(str(key_err)))
except tango.DevFailed as tango_err: except tango.DevFailed as tango_err:
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"""Release information for Python Package""" """Release information for Python Package"""
name = """csp-lmc-common""" name = """csp-lmc-common"""
version = "0.5.2" version = "0.5.3"
version_info = version.split(".") version_info = version.split(".")
description = """SKA CSP.LMC Common Software""" description = """SKA CSP.LMC Common Software"""
author = "INAF-OAA" author = "INAF-OAA"
......
...@@ -53,7 +53,7 @@ VALID_OBS_STATE = {'abort': [ObsState.CONFIGURING, ObsState.SCANNING], ...@@ -53,7 +53,7 @@ VALID_OBS_STATE = {'abort': [ObsState.CONFIGURING, ObsState.SCANNING],
'configscan': [ObsState.IDLE, ObsState.READY], 'configscan': [ObsState.IDLE, ObsState.READY],
'scan': [ObsState.READY], 'scan': [ObsState.READY],
'endscan': [ObsState.SCANNING], 'endscan': [ObsState.SCANNING],
'endsb': [ObsState.READY, ObsState.IDLE], 'gotoidle': [ObsState.READY, ObsState.IDLE],
'addresources': [ObsState.IDLE], 'addresources': [ObsState.IDLE],
'removeresources': [ObsState.IDLE] 'removeresources': [ObsState.IDLE]
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"""Release information for Python Package""" """Release information for Python Package"""
name = """csplmc-common""" name = """csplmc-common"""
version = "0.5.2" version = "0.5.3"
version_info = version.split(".") version_info = version.split(".")
description = """SKA CSP.LMC Common Classe""" description = """SKA CSP.LMC Common Classe"""
author = "E.G" author = "E.G"
...@@ -18,5 +18,5 @@ license = """BSD-3-Clause""" ...@@ -18,5 +18,5 @@ license = """BSD-3-Clause"""
url = """www.tango-controls.org""" url = """www.tango-controls.org"""
copyright = """""" copyright = """"""
release=0.5.1 release=0.5.3
tag=csp-lmc-common-0.5.2 tag=csp-lmc-common-0.5.3
...@@ -194,33 +194,3 @@ class TestCspMaster(object): ...@@ -194,33 +194,3 @@ class TestCspMaster(object):
time.sleep(3) time.sleep(3)
num_of_task = tango_context.device.numOfDevCompletedTask num_of_task = tango_context.device.numOfDevCompletedTask
assert num_of_task == 1 assert num_of_task == 1
def test_On_invalid_state(self, tango_context, cbf_master):
"""
Test for the execution of the On command when the CbfTestMaster
is in an invalid state
"""
#reinit CSP and CBFTest master devices
cbf_master.Init()
# sleep for a while to wait for state transitions
time.sleep(3)
#assert tango_context.device.cspCbfState == DevState.STANDBY
assert tango_context.device.cspCbfState == DevState.STANDBY
# issue the command to switch off the CbfMaster
argin = [tango_context.device.cbfMasterAddress,]
tango_context.device.Off(argin)
# wait for the state transition from STANDBY to OFF
time.sleep(3)
assert tango_context.device.cspCbfState == DevState.OFF
assert cbf_master.State() == DevState.OFF
# issue the command to switch on the CbfMaster device
with pytest.raises(tango.DevFailed) as df:
argin = ["mid_csp_cbf/sub_elt/master", ]
tango_context.device.On(argin)
assert "Command On not allowed when the device is in OFF state" in str(df.value.args[0].desc)
def test_off_execution_timeout(self, tango_context):
off_timeout = tango_context.device.offCmdTimeoutExpired
assert not off_timeout
time_measured = tango_context.device.offCmdDurationMeasured
assert time_measured > 0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment