Skip to content
Permalink
Browse files

Revert "Don't try to load oracle test data"

This reverts commit b62468e.
  • Loading branch information
nyalldawson committed Feb 11, 2021
1 parent d3d9d2b commit 5bb581885355a0573a972871b4ed89f27fc3c633
Showing with 24 additions and 24 deletions.
  1. +24 −24 .docker/docker-qgis-test.sh
@@ -57,30 +57,30 @@ popd > /dev/null # /root/QGIS
# Restore Oracle test data
##############################

#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'"
#
#echo "Wait a moment while loading Oracle database."
#COUNT=0
#while ! echo exit | sqlplus -L SYSTEM/adminpass@$QGIS_ORACLETEST_DBNAME &> /dev/null
#do
# printf "🙏"
# sleep 5
# if [[ $(( COUNT++ )) -eq 200 ]]; then
# break
# fi
#done
#if [[ ${COUNT} -eq 201 ]]; then
# echo "timeout, no oracle, no 🙏"
#else
# echo " done 👀"
# pushd /root/QGIS > /dev/null
# /root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST
# popd > /dev/null # /root/QGIS
#fi
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'"

echo "Wait a moment while loading Oracle database."
COUNT=0
while ! echo exit | sqlplus -L SYSTEM/adminpass@$QGIS_ORACLETEST_DBNAME &> /dev/null
do
printf "🙏"
sleep 5
if [[ $(( COUNT++ )) -eq 200 ]]; then
break
fi
done
if [[ ${COUNT} -eq 201 ]]; then
echo "timeout, no oracle, no 🙏"
else
echo " done 👀"
pushd /root/QGIS > /dev/null
/root/QGIS/tests/testdata/provider/testdata_oracle.sh $ORACLE_HOST
popd > /dev/null # /root/QGIS
fi

##############################
# Restore SQL Server test data

0 comments on commit 5bb5818

Please sign in to comment.