sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-16 00:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

make oracle loading a bit less boring (and fold the output) (#36239)

Browse Source
This commit is contained in:
Denis Rouzaud 2020-05-06 16:34:04 +02:00 committed by GitHub
parent 37efb4d598
commit 1ddcde9139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.ci/travis/linux/scripts/docker-qgis-test.sh
View File

@ -10,6 +10,9 @@ set -e
############################ ############################
# Restore postgres test data # 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 printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf
export PGUSER=docker export PGUSER=docker
export PGHOST=postgres export PGHOST=postgres
@ -30,11 +33,15 @@ echo "Restoring postgres test data ..."
/root/QGIS/tests/testdata/provider/testdata_pg.sh /root/QGIS/tests/testdata/provider/testdata_pg.sh
echo "Postgres test data restored ..." echo "Postgres test data restored ..."
popd > /dev/null # /root/QGIS popd > /dev/null # /root/QGIS
echo "travis_fold:end:postgres"
############################## ##############################
# Restore Oracle test data # Restore Oracle test data
############################## ##############################
echo "travis_fold:start:oracle"
echo "${bold}Load Oracle database...🙏${endbold}"
export ORACLE_HOST="oracle" export ORACLE_HOST="oracle"
export QGIS_ORACLETEST_DBNAME="${ORACLE_HOST}/XEPDB1" export QGIS_ORACLETEST_DBNAME="${ORACLE_HOST}/XEPDB1"
export QGIS_ORACLETEST_DB="host=${QGIS_ORACLETEST_DBNAME} port=1521 user='QGIS' password='qgis'" 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." echo "Wait a moment while loading Oracle database."
while ! echo exit | sqlplus -L SYSTEM/adminpass@$QGIS_ORACLETEST_DBNAME &> /dev/null while ! echo exit | sqlplus -L SYSTEM/adminpass@$QGIS_ORACLETEST_DBNAME &> /dev/null
do do
printf "." printf "🙏"
sleep 1 sleep 1
done done
echo " done" echo " done 👀"
pushd /root/QGIS > /dev/null pushd /root/QGIS > /dev/null
/root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST /root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST
popd > /dev/null # /root/QGIS popd > /dev/null # /root/QGIS
echo "travis_fold:end:oracle"
# this is proving very flaky: # this is proving very flaky: