kkk

qgis · Mar 8, 2019 · b2f3b55 · b2f3b55
1 parent e655d0f
commit b2f3b55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -27,12 +27,12 @@ docker run -t --name qgis_container \
 # commit container
 docker commit qgis_container qgis_image
 
-# 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"
-
 # running QGIS tests in commited image
 docker-compose -f ${TRAVIS_BUILD_DIR}/.ci/travis/linux/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh
 
+# 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 8  # Wait for xvfb to finish starting
 
 declare -A testrunners
 # Passing cases:

diff --git a/.ci/travis/linux/scripts/docker-qgis-test.sh b/.ci/travis/linux/scripts/docker-qgis-test.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+# wait for the DB to be available
+sleep
+
 # Temporarily uncomment to debug ccache issues
 # echo "travis_fold:start:ccache-debug"
 # cat /tmp/cache.debug