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

fix-setup-bug: try to fix the problem with ska-skuid depencencies. 

Added the requirements.txt file to install packages needed during tests.
Call 'pytest test' instead of 'python3 setup.py test' to run tests
parent 3e4f33ab

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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ k8s_test = tar -c . | \ 
		--image-pull-policy=IfNotPresent \

		--image=$(IMAGE_TO_TEST) -- \

		/bin/bash -c "tar xv --strip-components 1 --warning=all && \

		python3 -m pip install . &&\

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

		cd test-harness &&\

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

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

csp-lmc-mid/requirements-tst.txt

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ pytest-bdd 
pytest-cov

pytest-json-report

pytest-mock

#pytest-xdist == 1.34.0

pytest-forked

pycodestyle

coverage

mock

assertpy

csp-lmc-mid/setup.cfg

+1 −5
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ source = csp-lmc-mid 


[tool:pytest]

testpaths = tests

log_cli = True

log_cli_level = INFO

log_file = pytest-logs.txt

log_file_level = INFO

addopts = --forked

          --verbose

	  --cov=csp_lmc_mid

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 && python3 setup.py test| tee integration-test.stdout 

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

	mkdir -p build/reports && \

	if [ -d build ]; then \

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