Skip to content

Commit 0e990e1

Browse files
committed
Revert "Try resurrecting sql server tests on ci"
This reverts commit 48fce4d.
1 parent 8c96b2a commit 0e990e1

File tree

3 files changed

+26
-19
lines changed

3 files changed

+26
-19
lines changed

.ci/test_blocklist.txt

+4
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@ qgis_openclutilstest
2020
# Relies on a broken/unreliable 3rd party service
2121
qgis_layerdefinition
2222

23+
# MSSQL requires the MSSQL docker
24+
PyQgsProviderConnectionMssql
25+
26+
2327

.ci/test_flaky.txt

+3
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ qgis_wcsprovidertest
44
PyQgsWFSProviderGUI
55
qgis_ziplayertest
66

7+
# Flaky, the ms odbc driver crashes a lot on the ubuntu docker image. Retest when
8+
# the docker base image is upgraded
9+
PyQgsMssqlProvider

.docker/docker-qgis-test.sh

+19-19
Original file line numberDiff line numberDiff line change
@@ -86,31 +86,31 @@ fi
8686
# Restore SQL Server test data
8787
##############################
8888

89-
echo "Importing SQL Server test data..."
89+
# echo "Importing SQL Server test data..."
9090

91-
export SQLUSER=sa
92-
export SQLHOST=mssql
93-
export SQLPORT=1433
94-
export SQLPASSWORD='<YourStrong!Passw0rd>'
95-
export SQLDATABASE=qgis_test
91+
# export SQLUSER=sa
92+
# export SQLHOST=mssql
93+
# export SQLPORT=1433
94+
# export SQLPASSWORD='<YourStrong!Passw0rd>'
95+
# export SQLDATABASE=qgis_test
9696

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

99-
pushd /root/QGIS > /dev/null
100-
/root/QGIS/tests/testdata/provider/testdata_mssql.sh
101-
popd > /dev/null # /root/QGIS
99+
# pushd /root/QGIS > /dev/null
100+
# /root/QGIS/tests/testdata/provider/testdata_mssql.sh
101+
# popd > /dev/null # /root/QGIS
102102

103-
echo "Setting up DSN for test SQL Server"
103+
# echo "Setting up DSN for test SQL Server"
104104

105-
cat <<EOT > /etc/odbc.ini
106-
[ODBC Data Sources]
107-
testsqlserver = ODBC Driver 17 for SQL Server
105+
# cat <<EOT > /etc/odbc.ini
106+
# [ODBC Data Sources]
107+
# testsqlserver = ODBC Driver 17 for SQL Server
108108

109-
[testsqlserver]
110-
Driver = ODBC Driver 17 for SQL Server
111-
Description = Test SQL Server
112-
Server = mssql
113-
EOT
109+
# [testsqlserver]
110+
# Driver = ODBC Driver 17 for SQL Server
111+
# Description = Test SQL Server
112+
# Server = mssql
113+
# EOT
114114

115115
###########
116116
# Run tests

0 commit comments

Comments
 (0)