REGTESTS: extend the default I/O timeouts and make them overridable
With the CI occasionally slowing down, we're starting to see again some
spurious failures despite the long 1-second timeouts. This reports false
positives that are disturbing and doesn't provide as much value as this
could. However at this delay it already becomes a pain for developers
to wait for the tests to complete.
This commit adds support for the new environment variable
HAPROXY_TEST_TIMEOUT that will allow anyone to modify the connect,
client and server timeouts. It was set to 5 seconds by default, which
should be plenty for quite some time in the CI. All relevant values
that were 200ms or above were replaced by this one. A few larger
values were left as they are special. One test for the set-timeout
action that used to rely on a fixed 1-sec value was extended to a
fixed 5-sec, as the timeout is normally not reached, but it needs
to be known to compare the old and new values.
diff --git a/reg-tests/balance/balance-rr.vtc b/reg-tests/balance/balance-rr.vtc
index 531e84e..908a4f9 100644
--- a/reg-tests/balance/balance-rr.vtc
+++ b/reg-tests/balance/balance-rr.vtc
@@ -24,9 +24,9 @@
haproxy h1 -arg "-L A" -conf {
defaults
mode http
- timeout server 1s
- timeout connect 1s
- timeout client 1s
+ timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
listen px
bind "fd@${px}"
diff --git a/reg-tests/balance/balance-uri-path-only.vtc b/reg-tests/balance/balance-uri-path-only.vtc
index 1a66114..f1291ee 100644
--- a/reg-tests/balance/balance-uri-path-only.vtc
+++ b/reg-tests/balance/balance-uri-path-only.vtc
@@ -25,9 +25,9 @@
haproxy h1 -arg "-L A" -conf {
defaults
mode http
- timeout server 1s
- timeout connect 1s
- timeout client 1s
+ timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
listen px
bind "fd@${px}"
diff --git a/reg-tests/balance/balance-uri.vtc b/reg-tests/balance/balance-uri.vtc
index 4dddfe7..cc65d64 100644
--- a/reg-tests/balance/balance-uri.vtc
+++ b/reg-tests/balance/balance-uri.vtc
@@ -25,9 +25,9 @@
haproxy h1 -arg "-L A" -conf {
defaults
mode http
- timeout server 1s
- timeout connect 1s
- timeout client 1s
+ timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+ timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
listen px
bind "fd@${px}"