From 1ddcde91391a0882cf845d3bb4e8fc12f6ff1ba0 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Wed, 6 May 2020 16:34:04 +0200 Subject: [PATCH] make oracle loading a bit less boring (and fold the output) (#36239) --- .ci/travis/linux/scripts/docker-qgis-test.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.ci/travis/linux/scripts/docker-qgis-test.sh b/.ci/travis/linux/scripts/docker-qgis-test.sh index ec06b0dbf32..10d0d12acae 100755 --- a/.ci/travis/linux/scripts/docker-qgis-test.sh +++ b/.ci/travis/linux/scripts/docker-qgis-test.sh @@ -10,6 +10,9 @@ set -e ############################ # Restore postgres test data ############################ +echo "travis_fold:start:postgres" +echo "${bold}Load Postgres database...🐘${endbold}" + printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf export PGUSER=docker export PGHOST=postgres @@ -30,11 +33,15 @@ echo "Restoring postgres test data ..." /root/QGIS/tests/testdata/provider/testdata_pg.sh echo "Postgres test data restored ..." popd > /dev/null # /root/QGIS +echo "travis_fold:end:postgres" ############################## # Restore Oracle test data ############################## +echo "travis_fold:start:oracle" +echo "${bold}Load Oracle database...🙏${endbold}" + export ORACLE_HOST="oracle" export QGIS_ORACLETEST_DBNAME="${ORACLE_HOST}/XEPDB1" export QGIS_ORACLETEST_DB="host=${QGIS_ORACLETEST_DBNAME} port=1521 user='QGIS' password='qgis'" @@ -42,14 +49,15 @@ export QGIS_ORACLETEST_DB="host=${QGIS_ORACLETEST_DBNAME} port=1521 user='QGIS' echo "Wait a moment while loading Oracle database." while ! echo exit | sqlplus -L SYSTEM/adminpass@$QGIS_ORACLETEST_DBNAME &> /dev/null do - printf "." + printf "🙏" sleep 1 done -echo " done" +echo " done 👀" pushd /root/QGIS > /dev/null /root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST popd > /dev/null # /root/QGIS +echo "travis_fold:end:oracle" # this is proving very flaky: