Skip to content
Permalink
Browse files

enable Oracle test on CI (#41460)

  • Loading branch information
3nids committed Feb 10, 2021
1 parent 7edd999 commit c228204fb76c9396adc37f13f4521855342f246f
Showing with 24 additions and 27 deletions.
  1. +0 −2 .ci/test_blocklist.txt
  2. +24 −25 .docker/docker-qgis-test.sh
@@ -23,7 +23,5 @@ qgis_layerdefinition
# MSSQL requires the MSSQL docker
PyQgsProviderConnectionMssql

# Oracle image is temporarily disabled in the Github Actions builds
PyQgsOracleProvider


@@ -57,31 +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
# this is proving very flaky:
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 c228204

Please sign in to comment.