[travis] Restore postgres database after build

m-kuhn · m-kuhn · commit d62d9aa53a94 · 2017-09-28T13:22:35.000+02:00
This will give postgres plenty of time to start up
diff --git 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
