Skip to content
Permalink
Browse files

Revert "Try resurrecting sql server tests on ci"

This reverts commit 48fce4d.
  • Loading branch information
nyalldawson committed Feb 11, 2021
1 parent 2b1ba96 commit f9d9d7da37111735550a7b3a751f0350a0fd7155
Showing with 26 additions and 19 deletions.
  1. +4 −0 .ci/test_blocklist.txt
  2. +3 −0 .ci/test_flaky.txt
  3. +19 −19 .docker/docker-qgis-test.sh
@@ -20,4 +20,8 @@ qgis_openclutilstest
# Relies on a broken/unreliable 3rd party service
qgis_layerdefinition

# MSSQL requires the MSSQL docker
PyQgsProviderConnectionMssql



@@ -4,3 +4,6 @@ qgis_wcsprovidertest
PyQgsWFSProviderGUI
qgis_ziplayertest

# Flaky, the ms odbc driver crashes a lot on the ubuntu docker image. Retest when
# the docker base image is upgraded
PyQgsMssqlProvider
@@ -86,31 +86,31 @@ fi
# Restore SQL Server test data
##############################

echo "Importing SQL Server test data..."
# echo "Importing SQL Server test data..."

export SQLUSER=sa
export SQLHOST=mssql
export SQLPORT=1433
export SQLPASSWORD='<YourStrong!Passw0rd>'
export SQLDATABASE=qgis_test
# export SQLUSER=sa
# export SQLHOST=mssql
# export SQLPORT=1433
# export SQLPASSWORD='<YourStrong!Passw0rd>'
# export SQLDATABASE=qgis_test

export PATH=$PATH:/opt/mssql-tools/bin
# export PATH=$PATH:/opt/mssql-tools/bin

pushd /root/QGIS > /dev/null
/root/QGIS/tests/testdata/provider/testdata_mssql.sh
popd > /dev/null # /root/QGIS
# pushd /root/QGIS > /dev/null
# /root/QGIS/tests/testdata/provider/testdata_mssql.sh
# popd > /dev/null # /root/QGIS

echo "Setting up DSN for test SQL Server"
# echo "Setting up DSN for test SQL Server"

cat <<EOT > /etc/odbc.ini
[ODBC Data Sources]
testsqlserver = ODBC Driver 17 for SQL Server
# cat <<EOT > /etc/odbc.ini
# [ODBC Data Sources]
# testsqlserver = ODBC Driver 17 for SQL Server

[testsqlserver]
Driver = ODBC Driver 17 for SQL Server
Description = Test SQL Server
Server = mssql
EOT
# [testsqlserver]
# Driver = ODBC Driver 17 for SQL Server
# Description = Test SQL Server
# Server = mssql
# EOT

###########
# Run tests

0 comments on commit f9d9d7d

Please sign in to comment.