From d62d9aa53a94c9bb0f546d6fbdb14c9b70341ae8 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 20 Sep 2017 16:41:27 +0200 Subject: [PATCH] [travis] Restore postgres database after build This will give postgres plenty of time to start up --- .ci/travis/linux/docker-build-test.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh index 5b15f9dfc16..69e40b73582 100755 --- a/.ci/travis/linux/docker-build-test.sh +++ b/.ci/travis/linux/docker-build-test.sh @@ -14,17 +14,13 @@ ccache -z cd /root/QGIS -sleep 20 - printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf export PGUSER=docker export PGHOST=postgres export PGPASSWORD=docker export PGDATABASE=qgis_test -# export PYTHONIOENCODING="utf-8" - -/root/QGIS/tests/testdata/provider/testdata_pg.sh +# Build mkdir -p build && @@ -53,6 +49,9 @@ ls -la --full-time python/plugins/processing/tests/testdata/expected/polys_centr ninja +# Restore postgres test data +/root/QGIS/tests/testdata/provider/testdata_pg.sh + python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure ccache -s