Skip to content

Commit d62d9aa

Browse files
committedSep 28, 2017
[travis] Restore postgres database after build
This will give postgres plenty of time to start up
1 parent d64215e commit d62d9aa

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed
 

‎.ci/travis/linux/docker-build-test.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@ ccache -z
1414

1515
cd /root/QGIS
1616

17-
sleep 20
18-
1917
printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf
2018
export PGUSER=docker
2119
export PGHOST=postgres
2220
export PGPASSWORD=docker
2321
export PGDATABASE=qgis_test
2422

25-
# export PYTHONIOENCODING="utf-8"
26-
27-
/root/QGIS/tests/testdata/provider/testdata_pg.sh
23+
# Build
2824

2925
mkdir -p build &&
3026

@@ -53,6 +49,9 @@ ls -la --full-time python/plugins/processing/tests/testdata/expected/polys_centr
5349

5450
ninja
5551

52+
# Restore postgres test data
53+
/root/QGIS/tests/testdata/provider/testdata_pg.sh
54+
5655
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
5756

5857
ccache -s

0 commit comments

Comments
 (0)
Please sign in to comment.