REGTEST: set retries count to zero for all tests that expect at 503

Some tests expect a 503, typically those that check that wrong CA/CRL
will not be accepted between a server and a frontend. But such tests
tend to last very long simply because of the 1-second turn-around on
connection retries that happens during the failure. Let's properly set
the retries count to zero for these ones. One test purposely wants to
exhaust the retries so the retries was set to 1 instead.

diff --git a/reg-tests/http-messaging/http_abortonclose.vtc b/reg-tests/http-messaging/http_abortonclose.vtc
index 3a7208574f5f46b497fcb0d649edc6d7ac558b18..42f87f19f0fab9c73a4d680ac6033a9e9b9731e5 100644 (file)
--- a/reg-tests/http-messaging/http_abortonclose.vtc
+++ b/reg-tests/http-messaging/http_abortonclose.vtc
@@ -55,7 +55,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option abortonclose
-        retries 3
+        retries 1
         timeout client  10s
         timeout server  10s
         timeout connect 100ms

diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc b/reg-tests/ssl/del_ssl_crt-list.vtc
index 4815e2de75a2b8b139ac29546dd5f0e9241731c5..6aa02bf2c673d10245ddf456c63647c95d35ea1d 100644 (file)
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -29,6 +29,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc b/reg-tests/ssl/new_del_ssl_cafile.vtc
index b6cbc2064e557ac0200f02e6202f0f5be5a2b5d6..3ebc566c0f2860d46c1475a23108e5278fd6603f 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_cafile.vtc
+++ b/reg-tests/ssl/new_del_ssl_cafile.vtc
@@ -29,6 +29,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc b/reg-tests/ssl/new_del_ssl_crlfile.vtc
index 7330163c007d7893e0aeefabaa2c9c5b4887369f..2c9a0344f0af14539f5e2db7f29e0d8fddf14bac 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_crlfile.vtc
+++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc
@@ -29,6 +29,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc
index 0b5c3bac679c76080155ba98d6fe8d13f0166b14..f823bf2e50ef48e398b1bc5287ba4bb089ff8ae4 100644 (file)
--- a/reg-tests/ssl/set_ssl_cafile.vtc
+++ b/reg-tests/ssl/set_ssl_cafile.vtc
@@ -34,6 +34,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index 6938b20d932a9af8b9b4a6519f9e8030a4c785ec..2a8a904f2ba1c57502721854a76d669cf186717b 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -40,6 +40,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc b/reg-tests/ssl/set_ssl_cert_noext.vtc
index 0947fe0128b1a45967f9a431d10e8d8ba72af298..96a45b6b18a46f5a1f23686c4b23cb6aab200727 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -32,6 +32,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc
index ce83ff7716a3ffcc630e2d26c4aa488c1c6efeea..4f358feff9b871fa4203b0db79f192ff2fa36603 100644 (file)
--- a/reg-tests/ssl/set_ssl_crlfile.vtc
+++ b/reg-tests/ssl/set_ssl_crlfile.vtc
@@ -37,6 +37,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 100ms

diff --git a/reg-tests/ssl/ssl_crt-list_filters.vtc b/reg-tests/ssl/ssl_crt-list_filters.vtc
index 483531d70fbd7185f5ae7e509ee6a19fb7dc3f71..ad51ec82fd8429feaaf373d18be7d2affe2dc48b 100644 (file)
--- a/reg-tests/ssl/ssl_crt-list_filters.vtc
+++ b/reg-tests/ssl/ssl_crt-list_filters.vtc
@@ -22,6 +22,7 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
+        retries 0
         log stderr local0 debug err
         option logasap
         timeout connect 1s