run Python tests inside docker

3nids · 3nids · commit d42ff348909f · 2019-03-06T13:16:27.000+01:00
diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
@@ -166,3 +166,16 @@ popd > /dev/null # build
 popd > /dev/null # /root/QGIS
 
 [ -r /tmp/ctest-important.log ] && cat /tmp/ctest-important.log || true
+
+##############################
+# Run Python Tests on QGIS app
+##############################
+pushd /root/QGIS/tests/src/python
+# Passing cases:
+[[ $(qgis_testrunner.sh test_testrunner.run_passing) -eq '0' ]] || exit 1
+[[ $(qgis_testrunner.sh test_testrunner.run_skipped_and_passing) -eq '0' ]] || exit 1
+# Failing cases:
+[[ $(qgis_testrunner.sh test_testrunner) -eq '1' ]] || exit 1
+[[ $(qgis_testrunner.sh test_testrunner.run_all) -eq '1' ]] || exit 1
+[[ $(qgis_testrunner.sh test_testrunner.run_failing) -eq '1' ]] || exit 1
+popd
diff --git a/.ci/travis/linux/docker_test.sh b/.ci/travis/linux/docker_test.sh
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -17,20 +17,4 @@
 set -e
 
 # running QGIS tests
-docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run --rm qgis-deps
-
-# 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/qgis:${DOCKER_TAG}"
-sleep 10  # Wait for xvfb to finish starting
-# Temporary workaround until docker images are built
-docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/test_runner/qgis_testrunner.sh qgis-testing-environment:/usr/bin/qgis_testrunner.sh
-# Run tests in the docker
-# 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' ]]
-# 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' ]]
-
+docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run qgis-deps
diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml
@@ -33,3 +33,4 @@ services:
       - TRAVIS_TIMESTAMP=${TRAVIS_TIMESTAMP}
       - QGIS_DISABLE_MESSAGE_HOOKS=1
       - QGIS_NO_OVERRIDE_IMPORT=1
+      - DISPLAY=:99
