This project is archived. Its data is read-only.

Commit d0344302 authored Mar 16, 2020 by Elisabetta Giani

AT5-382: removed bugs related to wrong imports in tests.

parent 863b419a

csp-lmc-common/csp_lmc_common/CspCapabilityMonitor.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ from tango import AttrWriteType, PipeWriteType
		# Additional import
		# PROTECTED REGION ID(CspCapabilityMonitor.additionnal_import) ENABLED START #
		from ska.base import SKABaseDevice
		from ska.base.auxiliary import utils
		from ska.base import utils
		from ska.base.control_model import HealthState, AdminMode, ObsState, ObsMode
		# PROTECTED REGION END # // CspCapabilityMonitor.additionnal_import

csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ from tango.server import device_property
		from tango import AttrQuality, EventType, DevState
		from tango import AttrWriteType, DeviceProxy
		# Additional import
		# PROTECTED REGION ID(MidCspMaster.additional_import) ENABLED START #
		from ska.base import SKAMaster
		# PROTECTED REGION ID(MidCspSubarray.additional_import) ENABLED START #
		#from ska.base import SKAMaster
		from ska.base import utils
		from ska.base.control_model import HealthState, AdminMode, ObsState
		# import CSP.LMC Common package

csp-lmc-mid/tests/MidCspMaster_test.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ path = os.path.join(os.path.dirname(__file__), os.pardir)
		sys.path.insert(0, os.path.abspath(path))
		print(commons_pkg_path)
		#Local imports
		from csp_lmc_common.utils.cspcommons import AdminMode
		from ska.base.control_model import AdminMode

		# Device test case
		@pytest.mark.usefixtures("cbf_master", "midcsp_master", "cbf_subarray01", "midcsp_subarray01")

csp-lmc-mid/tests/MidCspSubarray_test.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ path = os.path.join(os.path.dirname(__file__), os.pardir)
		sys.path.insert(0, os.path.abspath(path))

		#Local imports
		from csp_lmc_common.utils.cspcommons import ObsState
		from ska.base.control_model import ObsState

		# Device test case
		@pytest.mark.usefixtures("midcsp_master", "midcsp_subarray01", "midcsp_subarray02", "cbf_subarray01")