Commit 54923a20 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

CT-60: Fix import bug. 

Skip tests written for the previous version of subarray state machine.
parent eff45f06

csp-lmc-mid/.pylintrc

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enable=unreachable, 
# --disable=W"

disable= R,C,W,

        no-member,

	access-member-before-definition



[REPORTS]

csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py

+4 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ from ska.base.commands import ActionCommand, ResponseCommand, ResultCode 
from ska.base.faults import CapabilityValidationError

from ska.base.control_model import HealthState, AdminMode, ObsState

# import CSP.LMC Common package

from csp_lmc_common.utils.utils import tango_raise

from csp_lmc_common.utils.cspcommons import CmdExecState

from csp_lmc_common.utils.decorators import AdminModeCheck, ObsStateCheck, SubarrayRejectCmd

from csp_lmc_common.CspSubarray import CspSubarray, CspSubarrayStateModel
@@ -209,7 +208,10 @@ class MidCspSubarrayBase(CspSubarray): 
            except AttributeError as attr_err:

                msg = "Failure in reading {}: {}".format(

                    str(attr_err.args[0]), attr_err.__doc__)

                tango_raise(msg)

                tango.Except.throw_exception("AttributeError",

                                             msg,

                                             "AddReceptorsCommand",

                                             tango.ErrSeverity.ERR)

            for receptorId in argin:

                # check if the specified receptor id is a valid number (that is, belongs to the list

                # of provided receptors)

csp-lmc-mid/docker/test-harness/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ test: 
	retry --max=10 -- tango_admin --ping-device mid_csp/elt/master

	retry --max=10 -- tango_admin --ping-device mid_csp/elt/subarray_01

	retry --max=10 -- tango_admin --ping-device mid_csp/elt/subarray_02

	cd /app && python setup.py test | tee setup_py_test.stdout

	cd /app && python setup.py test --addopts='-k-acceptance_tests'| tee setup_py_test.stdout

	mkdir -p /build/reports && \

	if [ -d /build ]; then \

		mv /app/setup_py_test.stdout /build/csp-lmc-mid-setup-test.stdout; \