Skip to content

Commit 8eb1e43

Browse files
ThibsGThibsG
committed
Fix tests suite
1 parent 9c60a44 commit 8eb1e43

File tree

2 files changed

+45
-42
lines changed

2 files changed

+45
-42
lines changed

‎.github/workflows/sqlx.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
command: test
245245
args: >
246246
--no-default-features
247-
--features any,postgres,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
247+
--features any,postgres,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
248248
env:
249249
DATABASE_URL: postgres://postgres@localhost:5432/sqlx?sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt&sslkey=.%2Ftests%2Fkeys%2Fclient.key&sslcert=.%2Ftests%2Fcerts%2Fclient.crt
250250
# FIXME: needed to disable `ltree` tests in Postgres 9.6
@@ -318,7 +318,7 @@ jobs:
318318
command: test
319319
args: >
320320
--no-default-features
321-
--features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
321+
--features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
322322
env:
323323
DATABASE_URL: mysql://root@localhost:3306/sqlx?sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt
324324
RUSTFLAGS: --cfg mysql_${{ matrix.mysql }}
@@ -376,7 +376,7 @@ jobs:
376376
command: test
377377
args: >
378378
--no-default-features
379-
--features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }}-${{ matrix.tls }}
379+
--features any,mysql,macros,migrate,all-types,runtime-${{ matrix.runtime }},tls-${{ matrix.tls }}
380380
env:
381381
DATABASE_URL: mysql://root@localhost:3306/sqlx?sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt
382382
RUSTFLAGS: --cfg mariadb_${{ matrix.mariadb }}

‎tests/x.py‎

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
142142
for runtime in ["async-std", "tokio"]:
143143
for tls in ["native-tls", "rustls", "none"]:
144144
run(
145-
f"cargo test --no-default-features --manifest-path sqlx-core/Cargo.toml --features json,offline,migrate,_rt-{runtime},_tls-{tls}",
145+
f"cargo test --no-default-features --manifest-path sqlx-core/Cargo.toml --features json,_rt-{runtime},_tls-{tls}",
146146
comment="unit test core",
147147
tag=f"unit_{runtime}_{tls}"
148148
)
@@ -171,31 +171,32 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
171171

172172
for version in ["14", "13", "12", "11", "10"]:
173173
run(
174-
f"cargo test --no-default-features --features macros,any,unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
174+
f"cargo test --no-default-features --features macros,any,_unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
175175
comment=f"test postgres {version}",
176176
service=f"postgres_{version}",
177177
tag=f"postgres_{version}" if runtime == "async-std" else f"postgres_{version}_{runtime}",
178178
)
179179

180-
## +ssl
181-
for version in ["14", "13", "12", "11", "10"]:
182-
run(
183-
f"cargo test --no-default-features --features macros,any,_unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
184-
comment=f"test postgres {version} ssl",
185-
database_url_args="sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt",
186-
service=f"postgres_{version}",
187-
tag=f"postgres_{version}_ssl" if runtime == "async-std" else f"postgres_{version}_ssl_{runtime}",
188-
)
189-
190-
## +client-ssl
191-
for version in ["14_client_ssl", "13_client_ssl", "12_client_ssl", "11_client_ssl", "10_client_ssl"]:
192-
run(
193-
f"cargo test --no-default-features --features macros,offline,any,all-types,postgres,runtime-{runtime}-{tls}",
194-
comment=f"test postgres {version} no-password",
195-
database_url_args="sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt&sslkey=.%2Ftests%2Fkeys%2Fclient.key&sslcert=.%2Ftests%2Fcerts%2Fclient.crt",
196-
service=f"postgres_{version}",
197-
tag=f"postgres_{version}_no_password" if runtime == "async-std" else f"postgres_{version}_no_password_{runtime}",
198-
)
180+
if tls != "none":
181+
## +ssl
182+
for version in ["14", "13", "12", "11", "10"]:
183+
run(
184+
f"cargo test --no-default-features --features macros,any,_unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
185+
comment=f"test postgres {version} ssl",
186+
database_url_args="sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt",
187+
service=f"postgres_{version}",
188+
tag=f"postgres_{version}_ssl" if runtime == "async-std" else f"postgres_{version}_ssl_{runtime}",
189+
)
190+
191+
## +client-ssl
192+
for version in ["14_client_ssl", "13_client_ssl", "12_client_ssl", "11_client_ssl", "10_client_ssl"]:
193+
run(
194+
f"cargo test --no-default-features --features macros,any,_unstable-all-types,postgres,runtime-{runtime},tls-{tls}",
195+
comment=f"test postgres {version} no-password",
196+
database_url_args="sslmode=verify-ca&sslrootcert=.%2Ftests%2Fcerts%2Fca.crt&sslkey=.%2Ftests%2Fkeys%2Fclient.key&sslcert=.%2Ftests%2Fcerts%2Fclient.crt",
197+
service=f"postgres_{version}",
198+
tag=f"postgres_{version}_no_password" if runtime == "async-std" else f"postgres_{version}_no_password_{runtime}",
199+
)
199200

200201
#
201202
# mysql
@@ -209,15 +210,16 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
209210
tag=f"mysql_{version}" if runtime == "async-std" else f"mysql_{version}_{runtime}",
210211
)
211212

212-
## +client-ssl
213-
for version in ["8_client_ssl", "5_7_client_ssl"]:
214-
run(
215-
f"cargo test --no-default-features --features macros,offline,any,all-types,mysql,runtime-{runtime}-{tls}",
216-
comment=f"test mysql {version} no-password",
217-
database_url_args="sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt",
218-
service=f"mysql_{version}",
219-
tag=f"mysql_{version}_no_password" if runtime == "async-std" else f"mysql_{version}_no_password_{runtime}",
220-
)
213+
if tls != "none":
214+
## +client-ssl
215+
for version in ["8_client_ssl", "5_7_client_ssl"]:
216+
run(
217+
f"cargo test --no-default-features --features macros,any,_unstable-all-types,mysql,runtime-{runtime},tls-{tls}",
218+
comment=f"test mysql {version} no-password",
219+
database_url_args="sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt",
220+
service=f"mysql_{version}",
221+
tag=f"mysql_{version}_no_password" if runtime == "async-std" else f"mysql_{version}_no_password_{runtime}",
222+
)
221223

222224
#
223225
# mariadb
@@ -231,15 +233,16 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
231233
tag=f"mariadb_{version}" if runtime == "async-std" else f"mariadb_{version}_{runtime}",
232234
)
233235

234-
## +client-ssl
235-
for version in ["10_6_client_ssl", "10_5_client_ssl", "10_4_client_ssl", "10_3_client_ssl"]:
236-
run(
237-
f"cargo test --no-default-features --features macros,offline,any,all-types,mysql,runtime-{runtime}-{tls}",
238-
comment=f"test mariadb {version} no-password",
239-
database_url_args="sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt",
240-
service=f"mariadb_{version}",
241-
tag=f"mariadb_{version}_no_password" if runtime == "async-std" else f"mariadb_{version}_no_password_{runtime}",
242-
)
236+
if tls != "none":
237+
## +client-ssl
238+
for version in ["10_6_client_ssl", "10_5_client_ssl", "10_4_client_ssl", "10_3_client_ssl"]:
239+
run(
240+
f"cargo test --no-default-features --features macros,any,_unstable-all-types,mysql,runtime-{runtime},tls-{tls}",
241+
comment=f"test mariadb {version} no-password",
242+
database_url_args="sslmode=verify_ca&ssl-ca=.%2Ftests%2Fcerts%2Fca.crt&ssl-key=.%2Ftests%2Fkeys%2Fclient.key&ssl-cert=.%2Ftests%2Fcerts%2Fclient.crt",
243+
service=f"mariadb_{version}",
244+
tag=f"mariadb_{version}_no_password" if runtime == "async-std" else f"mariadb_{version}_no_password_{runtime}",
245+
)
243246

244247
# TODO: Use [grcov] if available
245248
# ~/.cargo/bin/grcov tests/.cache/target/debug -s sqlx-core/ -t html --llvm --branch -o ./target/debug/coverage

0 commit comments

Comments
 (0)