Commit d81c2696 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

CT-215: Add the possibility to mark the tests. 

Fix some bugs in handling succeeded/failed methods.
parent dd413d48

csp-lmc-common/csp_lmc_common/CspSubarray.py

+5 −5
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ class CspSubarray(SKASubarray): 
                        return self.failed()

                    self.logger.info("Abort configure ends with success!!")

                    if all(target_device._sc_subarray_obs_state[fqdn] == ObsState.ABORTED for fqdn in device_list):

                        return self.succeeded()

                        return  target_device.abort_cmd_obj.succeeded()

                    return target_device.abort_cmd_obj.abort_monitoring(device_list)



                if target_device._timeout_expired or target_device._failure_raised:
@@ -1334,13 +1334,13 @@ class CspSubarray(SKASubarray): 
            # end of the while loop

            # check for timeout/failure conditions on each sub-component

            if target_device._failure_raised or target_device._timeout_expired:

                return self.restart_cmd_obj.failed()

                return self.failed()



            if all(target_device._sc_subarray_obs_state[fqdn] == ObsState.EMPTY for fqdn in device_list):

                target_device._cmd_progress[cmd_name] = 100

                target_device._last_executed_command = cmd_name

                self.logger.info("Restart ends with success")

                return self.restart_cmd_obj.succeeded()

                return self.succeeded()



    class GoToIdleCommand(SKASubarray.EndCommand):

        def do(self):
@@ -1449,8 +1449,8 @@ class CspSubarray(SKASubarray): 
                self.logger.info(log_msg)

                # update CSP sub-array SCM

                #07-2020: with the new base classes, transitions are handled via actions.

                if evt.attr_value.name.lower() in ["state", "healthstate", "adminmode", "obsstate"]:

                    self.update_subarray_state()

                #if evt.attr_value.name.lower() in ["state", "healthstate", "adminmode", "obsstate"]:

                #    self.update_subarray_state()

            except tango.DevFailed as df:

                self.logger.error(str(df.args[0].desc))

            except Exception as except_occurred:

csp-lmc-mid/.make/k8s.mk

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ k8s_test = tar -c . | \ 
		/bin/bash -c "tar xv --strip-components 1 --warning=all && \

		python3 -m pip install -r requirements-tst.txt . && \

		cd test-harness &&\

		make TANGO_HOST=$(TANGO_HOST) $1 && \

		make TANGO_HOST=$(TANGO_HOST) MARK='$(MARK)' $1 && \

		tar -czvf /tmp/build.tgz build && \

                echo '~~~~BOUNDARY~~~~' && \

                cat /tmp/build.tgz | base64 && \

csp-lmc-mid/test-harness/Makefile

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

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

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

	cd /app &&  pytest tests| tee integration-test.stdout 

	cd /app &&  pytest $(if $(findstring all,$(MARK)),, -m '$(MARK)')| tee integration-test.stdout

	mkdir -p build/reports && \

	if [ -d build ]; then \

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