Fix a minor bug in tests execution. (f1a6f0f8) · Commits · Gianluca Marotta / csp-lmc-old

csp-lmc-common/HISTORY

+3 −0

Original line number	Diff line number	Diff line
		0.5.10
		- fix a minor bug

		0.5.9
		- implemented the ADR-4 and ADR-10 decisions:
		- the json file contains the unique configuration ID

csp-lmc-common/csp_lmc_common/CspSubarray.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -1951,7 +1951,7 @@ class CspSubarray(SKASubarray):
		self._scan_id = int(argin[0])
		except ValueError as val_err:

		self.logging.error("Invalid argument:{}".format(str(var_err)))
		self.logging.error("Invalid argument:{}".format(str(val_err)))
		tango.Except.throw_exception("Command failed",
		str(val_err),
		"Scan execution",

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.9"
		version = "0.5.10"
		version_info = version.split(".")
		description = """SKA CSP.LMC Common Software"""
		author = "INAF-OAA"

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.9"
		version = "0.5.10"
		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.9
		tag=csp-lmc-common-0.5.9
		release=0.5.10
		tag=csp-lmc-common-0.5.10

csp-lmc-mid/tests/acceptance_tests/MidCspSubarrayConfiguration_test.py

+15 −13

Original line number	Diff line number	Diff line
		@@ -250,21 +250,21 @@ class TestCspSubarrayConfiguration(TestBase):
		self.midcsp_subarray01.Configure(configuration_string)
		prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.READY, f"CSP Subarray not configured")
		Poller(7, 0.2).check(prober_obs_state)
		LOGGER.info(f"Issue the Scan command sending the string \"abcd\" as input")
		LOGGER.info(f"Issue the Scan command sending the invalid string \"abcd\" as input")
		# exercise the device
		with pytest.raises(tango.DevFailed) as df:
		self.midcsp_subarray01.Scan("abcd")
		if df:
		err_msg = str(df.value.args[0].desc)
		LOGGER.error(f"Command configure failed on {self.midcsp_subarray01.dev_name()} with error: {err_msg}")
		LOGGER.error(f"Command Scan failed on {self.midcsp_subarray01.dev_name()} with error: {err_msg}")
		# check
		obs_state = self.midcsp_subarray01.obsState
		assert obs_state == ObsState.READY

		def test_cspsubarray_scan_WITH_no_argument(self):
		"""
		CSP Subarray receives the Scan command with an invalid
		scanId number
		CSP Subarray receives the Scan command with no
		input argument
		"""
		# setup the test: Subarray DISABLE-IDLE
		self._setup_csp_subarray()
		@@ -273,7 +273,7 @@ class TestCspSubarrayConfiguration(TestBase):
		self.midcsp_subarray01.Configure(configuration_string)
		prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.READY, f"CSP Subarray not configured")
		Poller(7, 0.2).check(prober_obs_state)
		LOGGER.info(f"Issue the Scan command sending the string \"abcd\" as input")
		LOGGER.info(f"Issue the Scan command with no input argument")
		# exercise the device
		with pytest.raises(tango.DevFailed) as df:
		self.midcsp_subarray01.Scan()
		@@ -287,7 +287,7 @@ class TestCspSubarrayConfiguration(TestBase):
		def test_cspsubarray_scan_WITH_int_argument(self):
		"""
		CSP Subarray receives the Scan command with an invalid
		scanId number
		argument data type
		"""
		# setup the test: Subarray DISABLE-IDLE
		self._setup_csp_subarray()
		@@ -302,15 +302,15 @@ class TestCspSubarrayConfiguration(TestBase):
		self.midcsp_subarray01.Scan(1)
		if df:
		err_msg = str(df.value.args[0].desc)
		LOGGER.error(f"Command configure failed on {self.midcsp_subarray01.dev_name()} with error: {err_msg}")
		LOGGER.error(f"Command Scan failed on {self.midcsp_subarray01.dev_name()} with error: {err_msg}")
		# check
		obs_state = self.midcsp_subarray01.obsState
		assert obs_state == ObsState.READY

		def test_cspsubarray_scan_WITH_valid_scan_id(self):
		"""
		CSP Subarray receives the Scan command with an invalid
		scanId number
		CSP Subarray receives the Scan command with a valid
		input argument
		"""
		# setup the test: Subarray DISABLE-IDLE
		self._setup_csp_subarray()
		@@ -319,11 +319,13 @@ class TestCspSubarrayConfiguration(TestBase):
		self.midcsp_subarray01.Configure(configuration_string)
		prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.READY, f"CSP Subarray not configured")
		Poller(7, 0.2).check(prober_obs_state)
		LOGGER.info(f"Issue the Scan command with a sequence")
		LOGGER.info(f"Issue the Scan command")
		# exercise the device
		self.midcsp_subarray01.Scan("1")
		prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.SCANNING, f"CSP Subarray not configured")
		# check
		prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.SCANNING, f"CSP Subarray wrong obstate")
		Poller(7, 0.2).check(prober_obs_state)
		self.midcsp_subarray01.EnScan()
		prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.READY, f"CSP Subarray not configured")
		# end the scan
		self.midcsp_subarray01.EndScan()
		prober_obs_state = Probe(self.midcsp_subarray01, 'obsState', ObsState.READY, f"CSP Subarray wrong obstate")
		Poller(7, 0.2).check(prober_obs_state)