diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 750245f4cfb4726ce87ee0bca7d6cae1599e0eef..77d0f312c426576fa90fe51fc9d3f921f58f739b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,4 +29,8 @@ run-tests: name: registry.git.fsmpi.rwth-aachen.de/videoag/backend_api/videoag_api_testing:$CI_COMMIT_SHA entrypoint: [""] script: - - $CI_PROJECT_DIR/docker_start.sh -test \ No newline at end of file + - $CI_PROJECT_DIR/docker_start.sh -test + artifacts: + paths: + - $CI_PROJECT_DIR/coverage/report.txt + - $CI_PROJECT_DIR/coverage/html/* diff --git a/docker_start.sh b/docker_start.sh index c1d51865bb88e32a9d88431555582ebc01949673..250ea1703e449e15b092b86f2315c52bf1fe51cf 100755 --- a/docker_start.sh +++ b/docker_start.sh @@ -11,10 +11,14 @@ if [ $# = 1 ] && [ $1 = "-test" ]; then uname -a export VIDEOAG_API_TEST_CONFIG_OVERRIDE="../config/test_config_override.py" python3 -V - python3 -m coverage run --data-file "../coverage/.data" run_tests.py - python3 -m coverage report --data-file "../coverage/.data" --include "./*" - python3 -m coverage report --data-file "../coverage/.data" -m --include "./*" > ../coverage/report.txt - python3 -m coverage html -d "../coverage/html/" --data-file "../coverage/.data" --include "./*" + python3 -m coverage run --data-file "../coverage/.data" run_tests.py || + { echo "Test failed!"; exit 1; } + python3 -m coverage report --data-file "../coverage/.data" --include "./*" || + { echo "Coverage report stdout failed"; exit 1; } + python3 -m coverage report --data-file "../coverage/.data" -m --include "./*" > ../coverage/report.txt || + { echo "Coverage report report.txt failed"; exit 1; } + python3 -m coverage html -d "../coverage/html/" --data-file "../coverage/.data" --include "./*" || + { echo "Coverage report html failed"; exit 1; } else echo "Running nginx and uWSGI" nginx -c ${VIDEOAG_NGINX_CONFIG} -p . & diff --git a/tests/routes/site.py b/tests/routes/site.py index 90b437eb51a540ac981bc37b1cae1c818f246306..527fac493c842f883f364e0904db088db3fa2bd6 100644 --- a/tests/routes/site.py +++ b/tests/routes/site.py @@ -8,7 +8,7 @@ class SiteTest(ApiTest): # TODO test live config self.do_json_request( "GET", - "/status", + "/path-which-does-not-exist", None, { "status": "available",