From 419c11728d3867bfe04bc1164ef9f874eec4c78b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 18 Nov 2021 17:15:59 +0100 Subject: [PATCH] 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. --- reg-tests/http-messaging/http_abortonclose.vtc | 2 +- reg-tests/ssl/del_ssl_crt-list.vtc | 1 + reg-tests/ssl/new_del_ssl_cafile.vtc | 1 + reg-tests/ssl/new_del_ssl_crlfile.vtc | 1 + reg-tests/ssl/set_ssl_cafile.vtc | 1 + reg-tests/ssl/set_ssl_cert.vtc | 1 + reg-tests/ssl/set_ssl_cert_noext.vtc | 1 + reg-tests/ssl/set_ssl_crlfile.vtc | 1 + reg-tests/ssl/ssl_crt-list_filters.vtc | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/reg-tests/http-messaging/http_abortonclose.vtc b/reg-tests/http-messaging/http_abortonclose.vtc index 3a72085..42f87f1 100644 --- 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 4815e2d..6aa02bf 100644 --- 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 b6cbc20..3ebc566 100644 --- 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 7330163..2c9a034 100644 --- 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 0b5c3ba..f823bf2 100644 --- 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 6938b20..2a8a904 100644 --- 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 0947fe0..96a45b6 100644 --- 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 ce83ff7..4f358fe 100644 --- 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 483531d..ad51ec8 100644 --- 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 -- 1.7.10.4