diff options
| author | William Lallemand <wlallemand@haproxy.org> | 2021-12-29 18:16:27 +0100 |
|---|---|---|
| committer | William Lallemand <wlallemand@haproxy.org> | 2021-12-29 18:20:19 +0100 |
| commit | 0387632ac0db520402550cf19a96d41f8c1661de (patch) | |
| tree | 91ac75e6c1010fd32e14af1d523f29f9b3984f13 | |
| parent | 2c776f1c30c85be11c9ba8ca8d9a7d62690d1a32 (diff) | |
| download | haproxy-0387632ac0db520402550cf19a96d41f8c1661de.tar.gz | |
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.
| -rw-r--r-- | reg-tests/ssl/ssl_default_server.vtc | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc index d5ff73ed6..485a9ba17 100644 --- a/reg-tests/ssl/ssl_default_server.vtc +++ b/reg-tests/ssl/ssl_default_server.vtc @@ -15,7 +15,7 @@ feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'" feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'" feature ignore_unknown_macro -server s1 -repeat 10 { +server s1 -repeat 7 { rxreq txresp } -start @@ -56,10 +56,7 @@ haproxy h1 -conf { backend third_be default-server ssl crt client1.pem ca-file ca-auth.crt verify none - server s1 "${tmpdir}/ssl.sock" - server s2 "${tmpdir}/ssl.sock" crt client2_expired.pem - server s3 "${tmpdir}/ssl.sock" - server s4 "${tmpdir}/ssl.sock" + server s1 "${tmpdir}/ssl.sock" crt client2_expired.pem backend fourth_be default-server ssl crt client1.pem verify none @@ -109,25 +106,9 @@ client c1 -connect ${h1_clearlst_sock} { txreq rxresp expect resp.status == 200 - expect resp.http.x-ssl == "Ok" -} -run - -client c1 -connect ${h1_clearlst_sock} { - txreq -url "/third" - txreq - rxresp - expect resp.status == 200 expect resp.http.x-ssl == "Expired" } -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} { txreq -url "/fourth" txreq |