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.

diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc
index d5ff73ed69f928b19b379897b206753835e67239..485a9ba17162da6ff371de265929a79b4a2a34ec 100644 (file)
--- 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
@@ -104,14 +101,6 @@ client c1 -connect ${h1_clearlst_sock} {
     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 == "Ok"
-} -run
-
 client c1 -connect ${h1_clearlst_sock} {
     txreq -url "/third"
     txreq
@@ -120,14 +109,6 @@ client c1 -connect ${h1_clearlst_sock} {
     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