more fixes

3nids · 3nids · commit b0783e6e91b0 · 2019-03-07T13:29:04.000+01:00
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -22,19 +22,22 @@ docker commit qgis_container qgis_image
 # running QGIS tests
 docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh
 
-docker run -it
-      - ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/test_runner:/root/qgis_test_runner
-
 # running tests for the python test runner
 docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}/tests/src/python:/tests_directory -e DISPLAY=:99 qgis_image "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf"
 sleep 10  # Wait for xvfb to finish starting
 
-# Run tests in the docker
+
+declare -A testrunners
 # Passing cases:
-TEST_SCRIPT_PATH=${TRAVIS_BUILD_DIR}/.ci/travis/linux/docker_test.sh
-[[ $(${TEST_SCRIPT_PATH} test_testrunner.run_passing) -eq '0' ]]
-[[ $(${TEST_SCRIPT_PATH} test_testrunner.run_skipped_and_passing) -eq '0' ]]
+testrunners["test_testrunner.run_passing"]=0
+testrunners["test_testrunner.run_skipped_and_passing"]=0
 # Failing cases:
-[[ $(${TEST_SCRIPT_PATH} test_testrunner) -eq '1' ]]
-[[ $(${TEST_SCRIPT_PATH} test_testrunner.run_all) -eq '1' ]]
-[[ $(${TEST_SCRIPT_PATH} test_testrunner.run_failing) -eq '1' ]]
+testrunners["test_testrunner"]=1
+testrunners["test_testrunner.run_all"]=1
+testrunners["test_testrunner.run_failing"]=1
+# Run tests in the docker
+for i in "${!testrunners[@]}"
+do
+  echo "test ${i}..."
+  $(docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh ${i}" &>/dev/null) -eq "${testrunners[$i]}" ]] && echo "success" || exit 1
+done
