REGTESTS: ssl: fix ssl_default_server.vtc

Patch 2c776f1 ("BUG/MEDIUM: ssl: initialize correctly ssl w/
default-server") added tests that are not relevant anymore and broke the
reg-test. revert them.
This commit is contained in:
William Lallemand 2021-12-29 18:16:27 +01:00
parent 2c776f1c30
commit 0387632ac0

View File

@ -15,7 +15,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
feature ignore_unknown_macro feature ignore_unknown_macro
server s1 -repeat 10 { server s1 -repeat 7 {
rxreq rxreq
txresp txresp
} -start } -start
@ -56,10 +56,7 @@ haproxy h1 -conf {
backend third_be backend third_be
default-server ssl crt client1.pem ca-file ca-auth.crt verify none default-server ssl crt client1.pem ca-file ca-auth.crt verify none
server s1 "${tmpdir}/ssl.sock" server s1 "${tmpdir}/ssl.sock" crt client2_expired.pem
server s2 "${tmpdir}/ssl.sock" crt client2_expired.pem
server s3 "${tmpdir}/ssl.sock"
server s4 "${tmpdir}/ssl.sock"
backend fourth_be backend fourth_be
default-server ssl crt client1.pem verify none default-server ssl crt client1.pem verify none
@ -104,14 +101,6 @@ client c1 -connect ${h1_clearlst_sock} {
expect resp.http.x-ssl == "Ok" expect resp.http.x-ssl == "Ok"
} -run } -run
client c1 -connect ${h1_clearlst_sock} {
txreq -url "/third"
txreq
rxresp
expect resp.status == 200
expect resp.http.x-ssl == "Ok"
} -run
client c1 -connect ${h1_clearlst_sock} { client c1 -connect ${h1_clearlst_sock} {
txreq -url "/third" txreq -url "/third"
txreq txreq
@ -120,14 +109,6 @@ client c1 -connect ${h1_clearlst_sock} {
expect resp.http.x-ssl == "Expired" expect resp.http.x-ssl == "Expired"
} -run } -run
client c1 -connect ${h1_clearlst_sock} -repeat 2 {
txreq -url "/third"
txreq
rxresp
expect resp.status == 200
expect resp.http.x-ssl == "Ok"
} -run
client c1 -connect ${h1_clearlst_sock} { client c1 -connect ${h1_clearlst_sock} {
txreq -url "/fourth" txreq -url "/fourth"
txreq txreq