Skip to content

Commit 1ddcde9

Browse files
authoredMay 6, 2020
make oracle loading a bit less boring (and fold the output) (#36239)
1 parent 37efb4d commit 1ddcde9

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed
 

‎.ci/travis/linux/scripts/docker-qgis-test.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ set -e
1010
############################
1111
# Restore postgres test data
1212
############################
13+
echo "travis_fold:start:postgres"
14+
echo "${bold}Load Postgres database...🐘${endbold}"
15+
1316
printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf
1417
export PGUSER=docker
1518
export PGHOST=postgres
@@ -30,26 +33,31 @@ echo "Restoring postgres test data ..."
3033
/root/QGIS/tests/testdata/provider/testdata_pg.sh
3134
echo "Postgres test data restored ..."
3235
popd > /dev/null # /root/QGIS
36+
echo "travis_fold:end:postgres"
3337

3438
##############################
3539
# Restore Oracle test data
3640
##############################
3741

42+
echo "travis_fold:start:oracle"
43+
echo "${bold}Load Oracle database...🙏${endbold}"
44+
3845
export ORACLE_HOST="oracle"
3946
export QGIS_ORACLETEST_DBNAME="${ORACLE_HOST}/XEPDB1"
4047
export QGIS_ORACLETEST_DB="host=${QGIS_ORACLETEST_DBNAME} port=1521 user='QGIS' password='qgis'"
4148

4249
echo "Wait a moment while loading Oracle database."
4350
while ! echo exit | sqlplus -L SYSTEM/adminpass@$QGIS_ORACLETEST_DBNAME &> /dev/null
4451
do
45-
printf "."
52+
printf "🙏"
4653
sleep 1
4754
done
48-
echo " done"
55+
echo " done 👀"
4956

5057
pushd /root/QGIS > /dev/null
5158
/root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST
5259
popd > /dev/null # /root/QGIS
60+
echo "travis_fold:end:oracle"
5361

5462
# this is proving very flaky:
5563

0 commit comments

Comments
 (0)
Please sign in to comment.