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

csp-lmc-common/csp_lmc_common/CspSubarray.py

+1 −1
Original line number Diff line number Diff line
@@ -2246,7 +2246,7 @@ class CspSubarray(SKASubarray): 
                # read the timeout attribute configured for this command

                # if not implemented an AttributeError exception is thrown

                # 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:

                self.logger.warning("GoToIdle execution:no key {} found".format(str(key_err)))

            except tango.DevFailed as tango_err:

csp-lmc-common/csp_lmc_common/release.py

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
"""Release information for Python Package"""



name = """csp-lmc-common"""

version = "0.5.2"

version = "0.5.3"

version_info = version.split(".")

description = """SKA CSP.LMC Common Software"""

author = "INAF-OAA"

csp-lmc-common/csp_lmc_common/utils/decorators.py

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ VALID_OBS_STATE = {'abort': [ObsState.CONFIGURING, ObsState.SCANNING], 
                   'configscan': [ObsState.IDLE, ObsState.READY],

                   'scan': [ObsState.READY],

                   'endscan': [ObsState.SCANNING],

                   'endsb': [ObsState.READY, ObsState.IDLE],

                   'gotoidle': [ObsState.READY, ObsState.IDLE],

                   'addresources': [ObsState.IDLE],

                   'removeresources': [ObsState.IDLE]

                   }

csp-lmc-common/docker/.release

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
"""Release information for Python Package"""



name = """csplmc-common"""

version = "0.5.2"

version = "0.5.3"

version_info = version.split(".")

description = """SKA CSP.LMC Common Classe"""

author = "E.G"
@@ -18,5 +18,5 @@ license = """BSD-3-Clause""" 
url = """www.tango-controls.org"""

copyright = """"""



release=0.5.1

tag=csp-lmc-common-0.5.2
 
release=0.5.3

tag=csp-lmc-common-0.5.3

csp-lmc-common/tests/CspMaster_test.py

+0 −30
Original line number Diff line number Diff line
@@ -194,33 +194,3 @@ class TestCspMaster(object): 
        time.sleep(3)

        num_of_task = tango_context.device.numOfDevCompletedTask

        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