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/README b/reg-tests/README
index 6993d97..ef721fd 100644 (file)
--- a/reg-tests/README
+++ b/reg-tests/README
@@ -63,3 +63,9 @@ See also: doc/regression-testing.txt
       of the VTC file,
     - Put these files in a directory with the same name as the code area concerned
       by the bug ('peers', 'lua', 'acl' etc).
+
+Please note that most tests use a common set of timeouts defined by the
+environment variable HAPROXY_TEST_TIMEOUT. As much as possible, for regular I/O
+(i.e. not errors), please try to reuse that setting so that the value may
+easily be adjusted when running in some particularly slow environments, or be
+shortened to fail faster on developers' machines.

diff --git a/reg-tests/balance/balance-rr.vtc b/reg-tests/balance/balance-rr.vtc
index 531e84e..908a4f9 100644 (file)
--- a/reg-tests/balance/balance-rr.vtc
+++ b/reg-tests/balance/balance-rr.vtc
@@ -24,9 +24,9 @@ server s4 {
 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 (file)
--- a/reg-tests/balance/balance-uri-path-only.vtc
+++ b/reg-tests/balance/balance-uri-path-only.vtc
@@ -25,9 +25,9 @@ server s4 {
 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 (file)
--- a/reg-tests/balance/balance-uri.vtc
+++ b/reg-tests/balance/balance-uri.vtc
@@ -25,9 +25,9 @@ server s4 {
 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/cache/basic.vtc b/reg-tests/cache/basic.vtc
index 30f4631..d6a8c00 100644 (file)
--- a/reg-tests/cache/basic.vtc
+++ b/reg-tests/cache/basic.vtc
@@ -27,9 +27,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/cache/caching_rules.vtc b/reg-tests/cache/caching_rules.vtc
index c65bc4b..b1ea7f9 100644 (file)
--- a/reg-tests/cache/caching_rules.vtc
+++ b/reg-tests/cache/caching_rules.vtc
@@ -86,9 +86,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/cache/expires.vtc b/reg-tests/cache/expires.vtc
index 309c4ae..ee5cd77 100644 (file)
--- a/reg-tests/cache/expires.vtc
+++ b/reg-tests/cache/expires.vtc
@@ -48,9 +48,9 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}"

diff --git a/reg-tests/cache/if-modified-since.vtc b/reg-tests/cache/if-modified-since.vtc
index d3c9b70..4d6ea6f 100644 (file)
--- a/reg-tests/cache/if-modified-since.vtc
+++ b/reg-tests/cache/if-modified-since.vtc
@@ -48,9 +48,9 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}"

diff --git a/reg-tests/cache/if-none-match.vtc b/reg-tests/cache/if-none-match.vtc
index bb5b9b5..b5ad033 100644 (file)
--- a/reg-tests/cache/if-none-match.vtc
+++ b/reg-tests/cache/if-none-match.vtc
@@ -33,9 +33,9 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}"

diff --git a/reg-tests/cache/post_on_entry.vtc b/reg-tests/cache/post_on_entry.vtc
index b24cfd6..66c89e4 100644 (file)
--- a/reg-tests/cache/post_on_entry.vtc
+++ b/reg-tests/cache/post_on_entry.vtc
@@ -25,9 +25,9 @@ server s1 {
 haproxy h1 -conf {
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}"

diff --git a/reg-tests/cache/sample_fetches.vtc b/reg-tests/cache/sample_fetches.vtc
index add6366..c2b1d15 100644 (file)
--- a/reg-tests/cache/sample_fetches.vtc
+++ b/reg-tests/cache/sample_fetches.vtc
@@ -52,9 +52,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/cache/vary.vtc b/reg-tests/cache/vary.vtc
index 197f822..b1c1bda 100644 (file)
--- a/reg-tests/cache/vary.vtc
+++ b/reg-tests/cache/vary.vtc
@@ -146,9 +146,9 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}"

diff --git a/reg-tests/cache/vary_accept_encoding.vtc b/reg-tests/cache/vary_accept_encoding.vtc
index 748c310..4b828a8 100644 (file)
--- a/reg-tests/cache/vary_accept_encoding.vtc
+++ b/reg-tests/cache/vary_accept_encoding.vtc
@@ -100,9 +100,9 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}"

diff --git a/reg-tests/checks/1be_40srv_odd_health_checks.vtc b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
index c279972..d0f3be5 100644 (file)
--- a/reg-tests/checks/1be_40srv_odd_health_checks.vtc
+++ b/reg-tests/checks/1be_40srv_odd_health_checks.vtc
@@ -58,9 +58,9 @@ server s39 {} -start
 
 haproxy h1 -conf {
     defaults
-        timeout client 1s
-        timeout server 1s
-        timeout connect 1s
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         default-server no-check inter 200ms downinter 100ms rise 1 fall 1
 
     backend be1

diff --git a/reg-tests/checks/40be_2srv_odd_health_checks.vtc b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
index 22f80cd..05b493d 100644 (file)
--- a/reg-tests/checks/40be_2srv_odd_health_checks.vtc
+++ b/reg-tests/checks/40be_2srv_odd_health_checks.vtc
@@ -238,9 +238,9 @@ server s39 {
 
 haproxy h1 -conf {
     defaults
-        timeout client 1s
-        timeout server 1s
-        timeout connect 1s
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         balance first
         default-server no-check inter 5ms downinter 1s rise 1 fall 1
 

diff --git a/reg-tests/checks/4be_1srv_health_checks.vtc b/reg-tests/checks/4be_1srv_health_checks.vtc
index 980c184..88b631a 100644 (file)
--- a/reg-tests/checks/4be_1srv_health_checks.vtc
+++ b/reg-tests/checks/4be_1srv_health_checks.vtc
@@ -94,9 +94,9 @@ syslog S4 -level notice {
 
 haproxy h1 -conf {
     defaults
-        timeout client  1s
-        timeout server  1s
-        timeout connect 1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         default-server check inter 200ms downinter 100s rise 1 fall 1
 
     frontend fe1

diff --git a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
index f9f37a1..5286bdb 100644 (file)
--- a/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
+++ b/reg-tests/checks/4be_1srv_smtpchk_httpchk_layer47errors.vtc
@@ -51,9 +51,9 @@ server s2 {
 
 haproxy h1 -conf {
     defaults
-        timeout client 1s
-        timeout server 1s
-        timeout connect 1s
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         option log-health-checks
         default-server inter 200ms downinter 100ms rise 1 fall 1
 

diff --git a/reg-tests/checks/agent-check.vtc b/reg-tests/checks/agent-check.vtc
index 4bab934..2744a62 100644 (file)
--- a/reg-tests/checks/agent-check.vtc
+++ b/reg-tests/checks/agent-check.vtc
@@ -18,9 +18,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/http-check-expect.vtc b/reg-tests/checks/http-check-expect.vtc
index 12f86d9..637eec6 100644 (file)
--- a/reg-tests/checks/http-check-expect.vtc
+++ b/reg-tests/checks/http-check-expect.vtc
@@ -27,9 +27,9 @@ syslog S1 -level notice {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         option log-health-checks
 
     backend be1

diff --git a/reg-tests/checks/http-check-send.vtc b/reg-tests/checks/http-check-send.vtc
index 76fd584..0970ee4 100644 (file)
--- a/reg-tests/checks/http-check-send.vtc
+++ b/reg-tests/checks/http-check-send.vtc
@@ -114,9 +114,9 @@ syslog S6 -level notice {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout client 1s
-        timeout server 1s
-        timeout connect 200ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         option httpchk
         option log-health-checks
 
@@ -131,9 +131,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout client 1s
-        timeout server 1s
-        timeout connect 200ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         option httpchk GET /status HTTP/1.1\r\nHdr:\ must-be-removed
         option log-health-checks
         http-check send hdr Host "my-www-host" hdr X-test true body "test"

diff --git a/reg-tests/checks/http-check.vtc b/reg-tests/checks/http-check.vtc
index 9ece54b..3353060 100644 (file)
--- a/reg-tests/checks/http-check.vtc
+++ b/reg-tests/checks/http-check.vtc
@@ -91,9 +91,9 @@ syslog S1 -level notice {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         option log-health-checks
 
     backend be1

diff --git a/reg-tests/checks/http-monitor-uri.vtc b/reg-tests/checks/http-monitor-uri.vtc
index c938abc..b6c8ccb 100644 (file)
--- a/reg-tests/checks/http-monitor-uri.vtc
+++ b/reg-tests/checks/http-monitor-uri.vtc
@@ -10,9 +10,9 @@ feature ignore_unknown_macro
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/checks/ldap-check.vtc b/reg-tests/checks/ldap-check.vtc
index c50c23e..a0e5509 100644 (file)
--- a/reg-tests/checks/ldap-check.vtc
+++ b/reg-tests/checks/ldap-check.vtc
@@ -53,9 +53,9 @@ syslog S4 -level notice {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/mysql-check.vtc b/reg-tests/checks/mysql-check.vtc
index 2d20714..b2348c3 100644 (file)
--- a/reg-tests/checks/mysql-check.vtc
+++ b/reg-tests/checks/mysql-check.vtc
@@ -66,9 +66,9 @@ syslog S5 -level notice {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/pgsql-check.vtc b/reg-tests/checks/pgsql-check.vtc
index 968a18c..417932e 100644 (file)
--- a/reg-tests/checks/pgsql-check.vtc
+++ b/reg-tests/checks/pgsql-check.vtc
@@ -42,9 +42,9 @@ syslog S3 -level notice {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/redis-check.vtc b/reg-tests/checks/redis-check.vtc
index c6d4fe4..78b6ed3 100644 (file)
--- a/reg-tests/checks/redis-check.vtc
+++ b/reg-tests/checks/redis-check.vtc
@@ -32,9 +32,9 @@ syslog S2 -level notice {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/smtp-check.vtc b/reg-tests/checks/smtp-check.vtc
index 29d0ddb..aea129c 100644 (file)
--- a/reg-tests/checks/smtp-check.vtc
+++ b/reg-tests/checks/smtp-check.vtc
@@ -63,9 +63,9 @@ syslog S5 -level notice {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/spop-check.vtc b/reg-tests/checks/spop-check.vtc
index c6b704b..93cef59 100644 (file)
--- a/reg-tests/checks/spop-check.vtc
+++ b/reg-tests/checks/spop-check.vtc
@@ -51,9 +51,9 @@ syslog S4 -level notice {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/ssl-hello-check.vtc b/reg-tests/checks/ssl-hello-check.vtc
index 7f8d9b9..49abc0b 100644 (file)
--- a/reg-tests/checks/ssl-hello-check.vtc
+++ b/reg-tests/checks/ssl-hello-check.vtc
@@ -29,9 +29,9 @@ haproxy htst -conf {
 
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}" ssl crt ${testdir}/common.pem
@@ -48,9 +48,9 @@ haproxy htst -conf {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/tcp-check-ssl.vtc b/reg-tests/checks/tcp-check-ssl.vtc
index 02dc6f0..6ac1782 100644 (file)
--- a/reg-tests/checks/tcp-check-ssl.vtc
+++ b/reg-tests/checks/tcp-check-ssl.vtc
@@ -34,9 +34,9 @@ haproxy htst -conf {
 
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen li1
         bind "fd@${li1}"
@@ -64,9 +64,9 @@ haproxy htst -conf {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S_ok_addr}:${S_ok_port} daemon

diff --git a/reg-tests/checks/tcp-check_min-recv.vtc b/reg-tests/checks/tcp-check_min-recv.vtc
index ab2d11c..81f93e0 100644 (file)
--- a/reg-tests/checks/tcp-check_min-recv.vtc
+++ b/reg-tests/checks/tcp-check_min-recv.vtc
@@ -33,10 +33,10 @@ server s2 {
 haproxy h1 -conf {
   defaults
     mode tcp
-    timeout connect 200ms
-    timeout check 500ms
-    timeout server 5s
-    timeout client 5s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout check "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
 
   backend be1
     # must fail fast

diff --git a/reg-tests/checks/tcp-check_multiple_ports.vtc b/reg-tests/checks/tcp-check_multiple_ports.vtc
index 895c83f..356ddf6 100644 (file)
--- a/reg-tests/checks/tcp-check_multiple_ports.vtc
+++ b/reg-tests/checks/tcp-check_multiple_ports.vtc
@@ -21,10 +21,10 @@ server s1 {
 haproxy h1 -conf {
   defaults
     mode tcp
-    timeout connect 200ms
-    timeout check 500ms
-    timeout server 5s
-    timeout client 5s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout check "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
     #default-server check inter 200ms rise 1 fall 1
 
   backend be1

diff --git a/reg-tests/checks/tcp-checks-socks4.vtc b/reg-tests/checks/tcp-checks-socks4.vtc
index 995298d..04c23ec 100644 (file)
--- a/reg-tests/checks/tcp-checks-socks4.vtc
+++ b/reg-tests/checks/tcp-checks-socks4.vtc
@@ -33,9 +33,9 @@ syslog S1 -level notice {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout client 1s
-        timeout server 1s
-        timeout connect 100ms
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         log ${S1_addr}:${S1_port} daemon

diff --git a/reg-tests/checks/tls_health_checks.vtc b/reg-tests/checks/tls_health_checks.vtc
index 75d7114..1989d65 100644 (file)
--- a/reg-tests/checks/tls_health_checks.vtc
+++ b/reg-tests/checks/tls_health_checks.vtc
@@ -38,9 +38,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout client 20
-        timeout server 20
-        timeout connect 20
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         server srv1 ${s1_addr}:${s1_port}
@@ -88,9 +88,9 @@ haproxy h2 -conf {
         tune.ssl.default-dh-param 2048
 
     defaults
-        timeout client 20
-        timeout server 20
-        timeout connect 20
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         default-server downinter 1s inter 500 rise 1 fall 1
 
     backend be2

diff --git a/reg-tests/compression/basic.vtc b/reg-tests/compression/basic.vtc
index 1df2293..76ad43d 100644 (file)
--- a/reg-tests/compression/basic.vtc
+++ b/reg-tests/compression/basic.vtc
@@ -180,9 +180,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe-gzip
         bind "fd@${fe_gzip}"

diff --git a/reg-tests/compression/etags_conversion.vtc b/reg-tests/compression/etags_conversion.vtc
index 901a5ef..c5684a2 100644 (file)
--- a/reg-tests/compression/etags_conversion.vtc
+++ b/reg-tests/compression/etags_conversion.vtc
@@ -114,9 +114,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe-gzip
         bind "fd@${fe_gzip}"

diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc
index ec6341b..8219c73 100644 (file)
--- a/reg-tests/compression/vary.vtc
+++ b/reg-tests/compression/vary.vtc
@@ -69,9 +69,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe-gzip
         bind "fd@${fe_gzip}"

diff --git a/reg-tests/connection/cli_src_dst.vtc b/reg-tests/connection/cli_src_dst.vtc
index fa12bc8..6809d39 100644 (file)
--- a/reg-tests/connection/cli_src_dst.vtc
+++ b/reg-tests/connection/cli_src_dst.vtc
@@ -6,9 +6,9 @@ feature ignore_unknown_macro
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/connection/dispatch.vtc b/reg-tests/connection/dispatch.vtc
index fccd6ec..8696b50 100644 (file)
--- a/reg-tests/connection/dispatch.vtc
+++ b/reg-tests/connection/dispatch.vtc
@@ -14,9 +14,9 @@ server s2 {
 haproxy h1 -conf {
 defaults
     log global
-    timeout connect 1s
-    timeout client 1s
-    timeout server 1s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
 
 listen fe_tcp
     bind "fd@${fe_tcp}"

diff --git a/reg-tests/connection/proxy_protocol_random_fail.vtc b/reg-tests/connection/proxy_protocol_random_fail.vtc
index 8884daa..bcaa03c 100644 (file)
--- a/reg-tests/connection/proxy_protocol_random_fail.vtc
+++ b/reg-tests/connection/proxy_protocol_random_fail.vtc
@@ -30,9 +30,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout client 1s
-        timeout server 1s
-        timeout connect 1s
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         log global
 
     listen http

diff --git a/reg-tests/connection/proxy_protocol_tlv_validation.vtc b/reg-tests/connection/proxy_protocol_tlv_validation.vtc
index 284bc91..8c7d734 100644 (file)
--- a/reg-tests/connection/proxy_protocol_tlv_validation.vtc
+++ b/reg-tests/connection/proxy_protocol_tlv_validation.vtc
@@ -10,9 +10,9 @@ feature ignore_unknown_macro
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend a
         bind "fd@${fe1}" accept-proxy
@@ -43,9 +43,9 @@ client c1 -connect ${h1_fe1_sock} {
 haproxy h2 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend a
         bind "fd@${fe1}" accept-proxy
@@ -80,9 +80,9 @@ client c2 -connect ${h2_fe1_sock} {
 haproxy h3 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend a
         bind "fd@${fe1}" accept-proxy
@@ -112,9 +112,9 @@ client c3 -connect ${h3_fe1_sock} {
 haproxy h4 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend a
         bind "fd@${fe1}" accept-proxy

diff --git a/reg-tests/contrib/prometheus.vtc b/reg-tests/contrib/prometheus.vtc
index ebe0b87..1ac6133 100644 (file)
--- a/reg-tests/contrib/prometheus.vtc
+++ b/reg-tests/contrib/prometheus.vtc
@@ -18,9 +18,9 @@ server s2 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
        option socket-stats
 
     listen stats

diff --git a/reg-tests/converter/be2dec.vtc b/reg-tests/converter/be2dec.vtc
index bdb9035..540392e 100644 (file)
--- a/reg-tests/converter/be2dec.vtc
+++ b/reg-tests/converter/be2dec.vtc
@@ -11,9 +11,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/be2hex.vtc b/reg-tests/converter/be2hex.vtc
index 86e5042..9d14744 100644 (file)
--- a/reg-tests/converter/be2hex.vtc
+++ b/reg-tests/converter/be2hex.vtc
@@ -11,9 +11,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/digest.vtc b/reg-tests/converter/digest.vtc
index a14f1cc..fab173d 100644 (file)
--- a/reg-tests/converter/digest.vtc
+++ b/reg-tests/converter/digest.vtc
@@ -13,9 +13,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/field.vtc b/reg-tests/converter/field.vtc
index 29608fe..d8a6130 100644 (file)
--- a/reg-tests/converter/field.vtc
+++ b/reg-tests/converter/field.vtc
@@ -10,9 +10,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/fix.vtc b/reg-tests/converter/fix.vtc
index 6be4676..8206da3 100644 (file)
--- a/reg-tests/converter/fix.vtc
+++ b/reg-tests/converter/fix.vtc
@@ -56,9 +56,9 @@ server s2 {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/converter/hmac.vtc b/reg-tests/converter/hmac.vtc
index f9d9d35..ef3aa6c 100644 (file)
--- a/reg-tests/converter/hmac.vtc
+++ b/reg-tests/converter/hmac.vtc
@@ -13,9 +13,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/iif.vtc b/reg-tests/converter/iif.vtc
index 22414e0..ffd58ee 100644 (file)
--- a/reg-tests/converter/iif.vtc
+++ b/reg-tests/converter/iif.vtc
@@ -11,9 +11,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/json.vtc b/reg-tests/converter/json.vtc
index b1c5f38..1f37c9f 100644 (file)
--- a/reg-tests/converter/json.vtc
+++ b/reg-tests/converter/json.vtc
@@ -11,9 +11,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/json_query.vtc b/reg-tests/converter/json_query.vtc
index b420942..1b195a7 100644 (file)
--- a/reg-tests/converter/json_query.vtc
+++ b/reg-tests/converter/json_query.vtc
@@ -17,9 +17,9 @@ haproxy h1 -conf {
 
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
        option http-buffer-request
 
     frontend fe

diff --git a/reg-tests/converter/mqtt.vtc b/reg-tests/converter/mqtt.vtc
index d4e319b..60458a3 100644 (file)
--- a/reg-tests/converter/mqtt.vtc
+++ b/reg-tests/converter/mqtt.vtc
@@ -53,9 +53,9 @@ server s2 {
 haproxy h1 -conf {
     defaults
         mode tcp
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/converter/secure_memcmp.vtc b/reg-tests/converter/secure_memcmp.vtc
index b16e021..67a7b7d 100644 (file)
--- a/reg-tests/converter/secure_memcmp.vtc
+++ b/reg-tests/converter/secure_memcmp.vtc
@@ -24,9 +24,9 @@ haproxy h1 -conf {
 
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        # This frontend matches two base64 encoded values and does not need to

diff --git a/reg-tests/converter/sha2.vtc b/reg-tests/converter/sha2.vtc
index 6ca021a..e90e274 100644 (file)
--- a/reg-tests/converter/sha2.vtc
+++ b/reg-tests/converter/sha2.vtc
@@ -13,9 +13,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/url_dec.vtc b/reg-tests/converter/url_dec.vtc
index 9db3b64..d5e317b 100644 (file)
--- a/reg-tests/converter/url_dec.vtc
+++ b/reg-tests/converter/url_dec.vtc
@@ -11,9 +11,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/converter/url_enc.vtc b/reg-tests/converter/url_enc.vtc
index a3f70ad..74acac8 100644 (file)
--- a/reg-tests/converter/url_enc.vtc
+++ b/reg-tests/converter/url_enc.vtc
@@ -12,9 +12,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/filters/random-forwarding.vtc b/reg-tests/filters/random-forwarding.vtc
index 650d207..3d01bcc 100644 (file)
--- a/reg-tests/filters/random-forwarding.vtc
+++ b/reg-tests/filters/random-forwarding.vtc
@@ -52,9 +52,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-capture/multiple_headers.vtc b/reg-tests/http-capture/multiple_headers.vtc
index f16b37e..1ae210b 100644 (file)
--- a/reg-tests/http-capture/multiple_headers.vtc
+++ b/reg-tests/http-capture/multiple_headers.vtc
@@ -41,9 +41,9 @@ server s {
 haproxy h -conf {
     defaults
         mode http
-        timeout client 1s
-        timeout server 1s
-        timeout connect 1s
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be
         server srv ${s_addr}:${s_port}

diff --git a/reg-tests/http-cookies/cookie_insert_indirect.vtc b/reg-tests/http-cookies/cookie_insert_indirect.vtc
index 3c4a06a..6b86360 100644 (file)
--- a/reg-tests/http-cookies/cookie_insert_indirect.vtc
+++ b/reg-tests/http-cookies/cookie_insert_indirect.vtc
@@ -28,9 +28,9 @@ haproxy h1 -conf {
     defaults
         mode http
                option httplog
-        timeout client 1s
-        timeout server 1s
-        timeout connect 1s
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
         log global
 
     backend be1

diff --git a/reg-tests/http-errorfiles/errorfiles.vtc b/reg-tests/http-errorfiles/errorfiles.vtc
index c8670ae..1ace744 100644 (file)
--- a/reg-tests/http-errorfiles/errorfiles.vtc
+++ b/reg-tests/http-errorfiles/errorfiles.vtc
@@ -9,9 +9,9 @@ feature ignore_unknown_macro
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
         errorfile 400  ${testdir}/errors/400.http
         errorfile 403  ${testdir}/errors/403.http
         errorfile 408  /dev/null

diff --git a/reg-tests/http-errorfiles/http-error.vtc b/reg-tests/http-errorfiles/http-error.vtc
index b03f2ac..1af909b 100644 (file)
--- a/reg-tests/http-errorfiles/http-error.vtc
+++ b/reg-tests/http-errorfiles/http-error.vtc
@@ -15,9 +15,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
         errorfile 400  ${testdir}/errors/400.http
         errorfile 404  ${testdir}/errors/404.http
 

diff --git a/reg-tests/http-errorfiles/http_deny_errors.vtc b/reg-tests/http-errorfiles/http_deny_errors.vtc
index 3a02af0..353045d 100644 (file)
--- a/reg-tests/http-errorfiles/http_deny_errors.vtc
+++ b/reg-tests/http-errorfiles/http_deny_errors.vtc
@@ -15,9 +15,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-errorfiles/http_errors.vtc b/reg-tests/http-errorfiles/http_errors.vtc
index 37e08cc..6b20be7 100644 (file)
--- a/reg-tests/http-errorfiles/http_errors.vtc
+++ b/reg-tests/http-errorfiles/http_errors.vtc
@@ -24,9 +24,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
        errorfiles errors-2
         errorfile 400  ${testdir}/errors/400.http
         errorfile 404  ${testdir}/errors/404.http

diff --git a/reg-tests/http-errorfiles/http_return.vtc b/reg-tests/http-errorfiles/http_return.vtc
index bc9934e..8db77a9 100644 (file)
--- a/reg-tests/http-errorfiles/http_return.vtc
+++ b/reg-tests/http-errorfiles/http_return.vtc
@@ -12,9 +12,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-messaging/h1_to_h1.vtc b/reg-tests/http-messaging/h1_to_h1.vtc
index 8d784d6..0d65366 100644 (file)
--- a/reg-tests/http-messaging/h1_to_h1.vtc
+++ b/reg-tests/http-messaging/h1_to_h1.vtc
@@ -122,9 +122,9 @@ haproxy h1 -conf {
 
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen feh1
        bind "fd@${feh1}"

diff --git a/reg-tests/http-messaging/h2_to_h1.vtc b/reg-tests/http-messaging/h2_to_h1.vtc
index a5e5657..852ee4c 100644 (file)
--- a/reg-tests/http-messaging/h2_to_h1.vtc
+++ b/reg-tests/http-messaging/h2_to_h1.vtc
@@ -44,9 +44,9 @@ haproxy h1 -conf {
        #log stdout format raw daemon
        mode http
        option http-buffer-request
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen feh1
        bind "fd@${feh1}"

diff --git a/reg-tests/http-messaging/http_bodyless_response.vtc b/reg-tests/http-messaging/http_bodyless_response.vtc
index 2df824b..9e0ce1c 100644 (file)
--- a/reg-tests/http-messaging/http_bodyless_response.vtc
+++ b/reg-tests/http-messaging/http_bodyless_response.vtc
@@ -38,9 +38,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-messaging/http_msg_full_on_eom.vtc b/reg-tests/http-messaging/http_msg_full_on_eom.vtc
index 5e914ef..2edba7d 100644 (file)
--- a/reg-tests/http-messaging/http_msg_full_on_eom.vtc
+++ b/reg-tests/http-messaging/http_msg_full_on_eom.vtc
@@ -29,9 +29,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout client  100ms
-        timeout server  1s
-        timeout connect 1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend be1
         tcp-response inspect-delay 100ms

diff --git a/reg-tests/http-messaging/http_request_buffer.vtc b/reg-tests/http-messaging/http_request_buffer.vtc
index c417814..35cca28 100644 (file)
--- a/reg-tests/http-messaging/http_request_buffer.vtc
+++ b/reg-tests/http-messaging/http_request_buffer.vtc
@@ -34,9 +34,9 @@ syslog S -level info {
 haproxy h1 -conf {
        defaults
                mode http
-               timeout client  100ms
-               timeout server  1s
-               timeout connect 1s
+               timeout client  100
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
        backend be1
                server srv1 ${s1_addr}:${s1_port}

diff --git a/reg-tests/http-messaging/http_transfer_encoding.vtc b/reg-tests/http-messaging/http_transfer_encoding.vtc
index 258b8a9..322dfe2 100644 (file)
--- a/reg-tests/http-messaging/http_transfer_encoding.vtc
+++ b/reg-tests/http-messaging/http_transfer_encoding.vtc
@@ -79,9 +79,9 @@ server s2 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-messaging/http_wait_for_body.vtc b/reg-tests/http-messaging/http_wait_for_body.vtc
index be1ca5b..a9f8191 100644 (file)
--- a/reg-tests/http-messaging/http_wait_for_body.vtc
+++ b/reg-tests/http-messaging/http_wait_for_body.vtc
@@ -72,9 +72,9 @@ server s2 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout server  1s
-        timeout connect 1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-messaging/protocol_upgrade.vtc b/reg-tests/http-messaging/protocol_upgrade.vtc
index 3458e77..ebb6328 100644 (file)
--- a/reg-tests/http-messaging/protocol_upgrade.vtc
+++ b/reg-tests/http-messaging/protocol_upgrade.vtc
@@ -88,9 +88,9 @@ server srv_h2_no_ws2 {
 haproxy hap -conf {
        defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        # h1 frontend connected to h2 frontend
        listen frt_h1_h2

diff --git a/reg-tests/http-messaging/scheme_based_normalize.vtc b/reg-tests/http-messaging/scheme_based_normalize.vtc
index 4511a5f..3edbafb 100644 (file)
--- a/reg-tests/http-messaging/scheme_based_normalize.vtc
+++ b/reg-tests/http-messaging/scheme_based_normalize.vtc
@@ -20,9 +20,9 @@ syslog S1 -level info {
 haproxy h1 -conf {
        defaults
                mode http
-               timeout connect 5s
-               timeout client  5s
-               timeout server  5s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}" proto h2

diff --git a/reg-tests/http-messaging/srv_ws.vtc b/reg-tests/http-messaging/srv_ws.vtc
index 32369a1..b26908e 100644 (file)
--- a/reg-tests/http-messaging/srv_ws.vtc
+++ b/reg-tests/http-messaging/srv_ws.vtc
@@ -11,9 +11,9 @@ feature ignore_unknown_macro
 haproxy hapsrv -conf {
        defaults
                mode http
-               timeout connect 5s
-               timeout client  5s
-               timeout server  5s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${fe}"
@@ -40,9 +40,9 @@ haproxy hapsrv -conf {
 haproxy hap -conf {
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        # proto X ws h1 -> websocket on h1
        listen li

diff --git a/reg-tests/http-messaging/websocket.vtc b/reg-tests/http-messaging/websocket.vtc
index 472e5f2..5f4b960 100644 (file)
--- a/reg-tests/http-messaging/websocket.vtc
+++ b/reg-tests/http-messaging/websocket.vtc
@@ -47,9 +47,9 @@ server s2 {
 haproxy hap_srv -conf {
        defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        listen fe1
        bind "fd@${fe1}"
@@ -69,9 +69,9 @@ haproxy hap_srv -conf {
 haproxy hap_srv_bad_key -conf {
        defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        listen fe1
        bind "fd@${fe1}"
@@ -89,9 +89,9 @@ haproxy hap_srv_bad_key -conf {
 haproxy hap -conf {
        defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        listen fe1
        bind "fd@${fe1}"

diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc b/reg-tests/http-rules/acl_cli_spaces.vtc
index 4db79a5..e61176a 100644 (file)
--- a/reg-tests/http-rules/acl_cli_spaces.vtc
+++ b/reg-tests/http-rules/acl_cli_spaces.vtc
@@ -14,9 +14,9 @@ haproxy h1 -W -S -conf {
     mode http
     log global
     option httplog
-    timeout connect         1s
-    timeout client          1s
-    timeout server          1s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   frontend fe1
     bind "fd@${fe1}"

diff --git a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
index 6628f36..97469b5 100644 (file)
--- a/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
+++ b/reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
@@ -74,9 +74,9 @@ haproxy h1 -conf {
     mode http
     log global
     option httplog
-    timeout connect         1s
-    timeout client          1s
-    timeout server          1s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   frontend fe1
     # accept-proxy so test client can send src ip
@@ -129,9 +129,9 @@ haproxy h2 -conf {
     mode http
     log global
     option httplog
-    timeout connect         1s
-    timeout client          1s
-    timeout server          1s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   frontend fe2
     bind "fd@${fe2}"

diff --git a/reg-tests/http-rules/default_rules.vtc b/reg-tests/http-rules/default_rules.vtc
index 3baa33a..f4a8fb9 100644 (file)
--- a/reg-tests/http-rules/default_rules.vtc
+++ b/reg-tests/http-rules/default_rules.vtc
@@ -20,9 +20,9 @@ server s2 {
 haproxy h1 -conf {
   defaults common
       mode http
-      timeout connect 1s
-      timeout client  1s
-      timeout server  1s
+      timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+      timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+      timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   defaults def_front from common
       http-request set-header x-frontend "%[fe_name]"
@@ -60,9 +60,9 @@ haproxy h1 -conf {
 haproxy h2 -conf {
   defaults common
       mode http
-      timeout connect 1s
-      timeout client  1s
-      timeout server  1s
+      timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+      timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+      timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   defaults def_front from common
       http-request allow

diff --git a/reg-tests/http-rules/del_header.vtc b/reg-tests/http-rules/del_header.vtc
index 32a7a70..0f74a60 100644 (file)
--- a/reg-tests/http-rules/del_header.vtc
+++ b/reg-tests/http-rules/del_header.vtc
@@ -36,9 +36,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/http-rules/except-forwardfor-originalto.vtc b/reg-tests/http-rules/except-forwardfor-originalto.vtc
index bb346dd..a859160 100644 (file)
--- a/reg-tests/http-rules/except-forwardfor-originalto.vtc
+++ b/reg-tests/http-rules/except-forwardfor-originalto.vtc
@@ -15,9 +15,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-rules/h1_to_h1c.vtc b/reg-tests/http-rules/h1_to_h1c.vtc
index 5ae1f93..9ae73f7 100644 (file)
--- a/reg-tests/http-rules/h1_to_h1c.vtc
+++ b/reg-tests/http-rules/h1_to_h1c.vtc
@@ -38,9 +38,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${fe}"

diff --git a/reg-tests/http-rules/h1or2_to_h1c.vtc b/reg-tests/http-rules/h1or2_to_h1c.vtc
index 4263a2a..9e7eb60 100644 (file)
--- a/reg-tests/http-rules/h1or2_to_h1c.vtc
+++ b/reg-tests/http-rules/h1or2_to_h1c.vtc
@@ -38,9 +38,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
        mode http
-       timeout connect 1s
-       timeout client  1s
-       timeout server  1s
+       timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+       timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
        bind "fd@${feh1}"

diff --git a/reg-tests/http-rules/http_after_response.vtc b/reg-tests/http-rules/http_after_response.vtc
index af66498..7e8cc1d 100644 (file)
--- a/reg-tests/http-rules/http_after_response.vtc
+++ b/reg-tests/http-rules/http_after_response.vtc
@@ -22,9 +22,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${feh1}"

diff --git a/reg-tests/http-rules/http_return.vtc b/reg-tests/http-rules/http_return.vtc
index 8189028..ae96775 100644 (file)
--- a/reg-tests/http-rules/http_return.vtc
+++ b/reg-tests/http-rules/http_return.vtc
@@ -14,9 +14,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/http-rules/map_redirect.vtc b/reg-tests/http-rules/map_redirect.vtc
index 67b586b..f55e0d8 100644 (file)
--- a/reg-tests/http-rules/map_redirect.vtc
+++ b/reg-tests/http-rules/map_redirect.vtc
@@ -36,9 +36,9 @@ haproxy h1 -conf {
     mode http
     log global
     option httplog
-    timeout connect         1s
-    timeout client          1s
-    timeout server          1s
+    timeout connect  "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client   "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server   "${HAPROXY_TEST_TIMEOUT-5s}"
 
   frontend fe1
     bind "fd@${fe1}"

diff --git a/reg-tests/http-rules/map_regm_with_backref.vtc b/reg-tests/http-rules/map_regm_with_backref.vtc
index 78af447..c3b21fb 100644 (file)
--- a/reg-tests/http-rules/map_regm_with_backref.vtc
+++ b/reg-tests/http-rules/map_regm_with_backref.vtc
@@ -40,9 +40,9 @@ haproxy h1 -conf {
     mode http
     log global
     option httplog
-    timeout connect         1s
-    timeout client          1s
-    timeout server          1s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   frontend fe1
     bind "fd@${fe1}"

diff --git a/reg-tests/http-rules/normalize_uri.vtc b/reg-tests/http-rules/normalize_uri.vtc
index 7e2d749..129a4b1 100644 (file)
--- a/reg-tests/http-rules/normalize_uri.vtc
+++ b/reg-tests/http-rules/normalize_uri.vtc
@@ -20,9 +20,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe_path_merge_slashes
         bind "fd@${fe_path_merge_slashes}"

diff --git a/reg-tests/http-rules/path_and_pathq.vtc b/reg-tests/http-rules/path_and_pathq.vtc
index ce697ca..31e85be 100644 (file)
--- a/reg-tests/http-rules/path_and_pathq.vtc
+++ b/reg-tests/http-rules/path_and_pathq.vtc
@@ -28,9 +28,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/http-rules/strict_rw_mode.vtc b/reg-tests/http-rules/strict_rw_mode.vtc
index acd2c24..14e6901 100644 (file)
--- a/reg-tests/http-rules/strict_rw_mode.vtc
+++ b/reg-tests/http-rules/strict_rw_mode.vtc
@@ -68,9 +68,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
         option http-buffer-request
 
     frontend fe1

diff --git a/reg-tests/http-set-timeout/set_timeout.vtc b/reg-tests/http-set-timeout/set_timeout.vtc
index 6840164..ebaa6a3 100644 (file)
--- a/reg-tests/http-set-timeout/set_timeout.vtc
+++ b/reg-tests/http-set-timeout/set_timeout.vtc
@@ -11,24 +11,24 @@ server srv_h1 -repeat 3 {
 
 syslog Slog1 -level info {
     recv
-    expect ~ "^.*timeout: 1000 1000.*$"
+    expect ~ "^.*timeout: 5000 5000.*$"
 } -start
 
 syslog Slog2 -level info {
     recv
-    expect ~ "^.*timeout: 1000 5000.*$"
+    expect ~ "^.*timeout: 5000 5000.*$"
 } -start
 
 syslog Slog3 -level info {
     recv
-    expect ~ "^.*timeout: 1000 3000.*$"
+    expect ~ "^.*timeout: 5000 3000.*$"
 } -start
 
 haproxy hap -conf {
     defaults
-        timeout connect 1s
-        timeout client 1s
-        timeout server 1s
+        timeout connect 5s
+        timeout client 5s
+        timeout server 5s
         log global
 
     listen li1

diff --git a/reg-tests/jwt/jws_verify.vtc b/reg-tests/jwt/jws_verify.vtc
index 91ead4a..d8afcae 100644 (file)
--- a/reg-tests/jwt/jws_verify.vtc
+++ b/reg-tests/jwt/jws_verify.vtc
@@ -29,9 +29,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen main-fe
         bind "fd@${mainfe}"

diff --git a/reg-tests/log/load_balancing.vtc b/reg-tests/log/load_balancing.vtc
index a897877..22aacae 100644 (file)
--- a/reg-tests/log/load_balancing.vtc
+++ b/reg-tests/log/load_balancing.vtc
@@ -42,9 +42,9 @@ haproxy h1 -conf {
        defaults
                mode http
                option httplog
-               timeout connect 1000
-               timeout client  1000
-               timeout server  1000
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe1
                bind "fd@${fe_1}"

diff --git a/reg-tests/log/log_uri.vtc b/reg-tests/log/log_uri.vtc
index b5a5753..6993b7c 100644 (file)
--- a/reg-tests/log/log_uri.vtc
+++ b/reg-tests/log/log_uri.vtc
@@ -26,9 +26,9 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        timeout connect 1000
-        timeout client  1000
-        timeout server  1000
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe_1}"

diff --git a/reg-tests/log/wrong_ip_port_logging.vtc b/reg-tests/log/wrong_ip_port_logging.vtc
index afb71e0..af8ca84 100644 (file)
--- a/reg-tests/log/wrong_ip_port_logging.vtc
+++ b/reg-tests/log/wrong_ip_port_logging.vtc
@@ -39,9 +39,9 @@ haproxy h1 -conf {
 
 defaults
     log global
-    timeout connect 3000
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
     timeout client 1
-    timeout server  10000
+    timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 frontend fe1
     bind "fd@${fe_1}"

diff --git a/reg-tests/lua/bad_http_clt_req_duration.vtc b/reg-tests/lua/bad_http_clt_req_duration.vtc
index 119f7f6..5cfdf1a 100644 (file)
--- a/reg-tests/lua/bad_http_clt_req_duration.vtc
+++ b/reg-tests/lua/bad_http_clt_req_duration.vtc
@@ -38,9 +38,9 @@ haproxy h1 -conf {
         lua-load ${testdir}/bad_http_clt_req_duration.lua
 
     defaults
-        timeout client 1s
-        timeout server 1s
-        timeout connect 1s
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend f1
         mode http

diff --git a/reg-tests/lua/close_wait_lf.vtc b/reg-tests/lua/close_wait_lf.vtc
index b6772b0..7bed3fd 100644 (file)
--- a/reg-tests/lua/close_wait_lf.vtc
+++ b/reg-tests/lua/close_wait_lf.vtc
@@ -26,8 +26,8 @@ syslog Slog -level info -repeat 100 {
 
 haproxy h1 -conf {
     defaults
-        timeout client  1s
-        timeout connect 1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
 
     global
         lua-load ${testdir}/close_wait_lf.lua

diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc
index e9d8ff6..ae533da 100644 (file)
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -11,9 +11,9 @@ server s1 {
 haproxy h1 -W -S -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend myfrontend
         bind "fd@${my_fe}"

diff --git a/reg-tests/mcli/mcli_start_progs.vtc b/reg-tests/mcli/mcli_start_progs.vtc
index eb6f635..a2e0f75 100644 (file)
--- a/reg-tests/mcli/mcli_start_progs.vtc
+++ b/reg-tests/mcli/mcli_start_progs.vtc
@@ -12,9 +12,9 @@ server s1 {
 haproxy h1 -W -S -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend myfrontend
         bind "fd@${my_fe}"

diff --git a/reg-tests/peers/basic_sync.vtc b/reg-tests/peers/basic_sync.vtc
index 1edfae6..02449e2 100644 (file)
--- a/reg-tests/peers/basic_sync.vtc
+++ b/reg-tests/peers/basic_sync.vtc
@@ -6,9 +6,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -arg "-L A" -conf {
     defaults
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
         stick-table type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000) peers peers
@@ -29,9 +29,9 @@ haproxy h1 -arg "-L A" -conf {
 haproxy h2 -arg "-L B" -conf {
     defaults
        mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
         stick-table type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000) peers peers
@@ -51,9 +51,9 @@ haproxy h2 -arg "-L B" -conf {
 haproxy h3 -arg "-L C" -conf {
     defaults
        mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
         stick-table type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000) peers peers

diff --git a/reg-tests/peers/basic_sync_wo_stkt_backend.vtc b/reg-tests/peers/basic_sync_wo_stkt_backend.vtc
index 0dce75f..e4f59e1 100644 (file)
--- a/reg-tests/peers/basic_sync_wo_stkt_backend.vtc
+++ b/reg-tests/peers/basic_sync_wo_stkt_backend.vtc
@@ -6,9 +6,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -arg "-L A" -conf {
     defaults
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     peers peers
@@ -28,9 +28,9 @@ haproxy h1 -arg "-L A" -conf {
 haproxy h2 -arg "-L B" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     peers peers
         bind "fd@${B}"
@@ -48,9 +48,9 @@ haproxy h2 -arg "-L B" -conf {
 haproxy h3 -arg "-L C" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     peers peers
         bind "fd@${C}"

diff --git a/reg-tests/peers/tls_basic_sync.vtc b/reg-tests/peers/tls_basic_sync.vtc
index 035abbe..7b6e9b2 100644 (file)
--- a/reg-tests/peers/tls_basic_sync.vtc
+++ b/reg-tests/peers/tls_basic_sync.vtc
@@ -7,9 +7,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -arg "-L A" -conf {
     defaults
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
         stick-table type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000) peers peers
@@ -32,9 +32,9 @@ haproxy h1 -arg "-L A" -conf {
 haproxy h2 -arg "-L B" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
         stick-table type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000) peers peers
@@ -56,9 +56,9 @@ haproxy h2 -arg "-L B" -conf {
 haproxy h3 -arg "-L C" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
         stick-table type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000) peers peers
@@ -80,9 +80,9 @@ haproxy h3 -arg "-L C" -conf {
 haproxy h4 -arg "-L D" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
         stick-table type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000) peers peers

diff --git a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
index b145ac8..44cd754 100644 (file)
--- a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
+++ b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
@@ -7,9 +7,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -arg "-L A" -conf {
     defaults
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     peers peers
         table stkt type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000)
@@ -30,9 +30,9 @@ haproxy h1 -arg "-L A" -conf {
 haproxy h2 -arg "-L B" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     peers peers
         table stkt type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000)
@@ -52,9 +52,9 @@ haproxy h2 -arg "-L B" -conf {
 haproxy h3 -arg "-L C" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     peers peers
         table stkt type string size 10m store server_id,gpc0,conn_cur,conn_rate(50000)
@@ -74,9 +74,9 @@ haproxy h3 -arg "-L C" -conf {
 haproxy h4 -arg "-L D" -conf {
     defaults
         mode http
-        timeout client  1s
-        timeout connect 1s
-        timeout server  1s
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     backend stkt
 

diff --git a/reg-tests/sample_fetches/hashes.vtc b/reg-tests/sample_fetches/hashes.vtc
index bcc3952..2c2f60d 100644 (file)
--- a/reg-tests/sample_fetches/hashes.vtc
+++ b/reg-tests/sample_fetches/hashes.vtc
@@ -12,9 +12,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/sample_fetches/srv_name.vtc b/reg-tests/sample_fetches/srv_name.vtc
index d209c6e..900957e 100644 (file)
--- a/reg-tests/sample_fetches/srv_name.vtc
+++ b/reg-tests/sample_fetches/srv_name.vtc
@@ -17,9 +17,9 @@ server s2 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/sample_fetches/ubase64.vtc b/reg-tests/sample_fetches/ubase64.vtc
index 0122bad..8e47d86 100644 (file)
--- a/reg-tests/sample_fetches/ubase64.vtc
+++ b/reg-tests/sample_fetches/ubase64.vtc
@@ -13,9 +13,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe
         bind "fd@${fe}"

diff --git a/reg-tests/sample_fetches/vars.vtc b/reg-tests/sample_fetches/vars.vtc
index 8a04718..5144e9f 100644 (file)
--- a/reg-tests/sample_fetches/vars.vtc
+++ b/reg-tests/sample_fetches/vars.vtc
@@ -16,9 +16,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend fe1
         bind "fd@${fe1}"

diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index 5932a78..2ea8dd3 100644 (file)
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -30,9 +30,9 @@ haproxy h1 -W -conf {
     mode http
     log global
     option httplog
-    timeout connect         1s
-    timeout client          1s
-    timeout server          1s
+    timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+    timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   listen testme
     bind "fd@${testme}"

diff --git a/reg-tests/server/cli_add_server.vtc b/reg-tests/server/cli_add_server.vtc
index 670eaac..fefdb0c 100644 (file)
--- a/reg-tests/server/cli_add_server.vtc
+++ b/reg-tests/server/cli_add_server.vtc
@@ -12,9 +12,9 @@ server s1 {
 haproxy h1 -conf {
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${feS}"

diff --git a/reg-tests/server/cli_add_ssl_server.vtc b/reg-tests/server/cli_add_ssl_server.vtc
index d375152..242d059 100644 (file)
--- a/reg-tests/server/cli_add_ssl_server.vtc
+++ b/reg-tests/server/cli_add_ssl_server.vtc
@@ -11,9 +11,9 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        # proxy to attach a ssl server
        listen li-ssl

diff --git a/reg-tests/server/cli_delete_dynamic_server.vtc b/reg-tests/server/cli_delete_dynamic_server.vtc
index b1ddc4f..a8b3036 100644 (file)
--- a/reg-tests/server/cli_delete_dynamic_server.vtc
+++ b/reg-tests/server/cli_delete_dynamic_server.vtc
@@ -24,9 +24,9 @@ server s2 -repeat 3 {
 haproxy h1 -conf {
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${feS}"

diff --git a/reg-tests/server/cli_delete_server.vtc b/reg-tests/server/cli_delete_server.vtc
index 68f702b..9721518 100644 (file)
--- a/reg-tests/server/cli_delete_server.vtc
+++ b/reg-tests/server/cli_delete_server.vtc
@@ -9,9 +9,9 @@ feature ignore_unknown_macro
 haproxy h1 -conf {
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${feS}"

diff --git a/reg-tests/server/cli_delete_server_lua.vtc b/reg-tests/server/cli_delete_server_lua.vtc
index 1b2473d..396cd21 100644 (file)
--- a/reg-tests/server/cli_delete_server_lua.vtc
+++ b/reg-tests/server/cli_delete_server_lua.vtc
@@ -17,9 +17,9 @@ haproxy h1 -conf {
 
        defaults
                mode http
-               timeout connect 1s
-               timeout client  1s
-               timeout server  1s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend fe
                bind "fd@${feS}"

diff --git a/reg-tests/server/cli_set_fdqn.vtc b/reg-tests/server/cli_set_fdqn.vtc
index da003fe..3055f76 100644 (file)
--- a/reg-tests/server/cli_set_fdqn.vtc
+++ b/reg-tests/server/cli_set_fdqn.vtc
@@ -13,9 +13,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend myfrontend
         bind "fd@${my_fe}"

diff --git a/reg-tests/server/cli_set_ssl.vtc b/reg-tests/server/cli_set_ssl.vtc
index 387c299..093943b 100644 (file)
--- a/reg-tests/server/cli_set_ssl.vtc
+++ b/reg-tests/server/cli_set_ssl.vtc
@@ -17,9 +17,9 @@ haproxy h1 -conf {
 
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend myfrontend
         bind "fd@${my_fe}"

diff --git a/reg-tests/spoe/wrong_init.vtc b/reg-tests/spoe/wrong_init.vtc
index 75d8da6..152622c 100644 (file)
--- a/reg-tests/spoe/wrong_init.vtc
+++ b/reg-tests/spoe/wrong_init.vtc
@@ -13,9 +13,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf-BAD {} {
        defaults
-        timeout connect 5000ms
-        timeout client 50000ms
-        timeout server 50000ms
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend my-front
                filter spoe

diff --git a/reg-tests/ssl/add_ssl_crt-list.vtc b/reg-tests/ssl/add_ssl_crt-list.vtc
index d3f8d75..5ed72bf 100644 (file)
--- a/reg-tests/ssl/add_ssl_crt-list.vtc
+++ b/reg-tests/ssl/add_ssl_crt-list.vtc
@@ -33,9 +33,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     listen clear-lst

diff --git a/reg-tests/ssl/del_ssl_crt-list.vtc b/reg-tests/ssl/del_ssl_crt-list.vtc
index 6aa02bf..70dbbb5 100644 (file)
--- a/reg-tests/ssl/del_ssl_crt-list.vtc
+++ b/reg-tests/ssl/del_ssl_crt-list.vtc
@@ -29,12 +29,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     listen clear-lst

diff --git a/reg-tests/ssl/new_del_ssl_cafile.vtc b/reg-tests/ssl/new_del_ssl_cafile.vtc
index 3ebc566..166ba2c 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_cafile.vtc
+++ b/reg-tests/ssl/new_del_ssl_cafile.vtc
@@ -29,12 +29,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/new_del_ssl_crlfile.vtc b/reg-tests/ssl/new_del_ssl_crlfile.vtc
index 2c9a034..8658a1a 100644 (file)
--- a/reg-tests/ssl/new_del_ssl_crlfile.vtc
+++ b/reg-tests/ssl/new_del_ssl_crlfile.vtc
@@ -29,12 +29,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/set_ssl_cafile.vtc b/reg-tests/ssl/set_ssl_cafile.vtc
index f823bf2..38ee919 100644 (file)
--- a/reg-tests/ssl/set_ssl_cafile.vtc
+++ b/reg-tests/ssl/set_ssl_cafile.vtc
@@ -34,12 +34,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/set_ssl_cert.vtc b/reg-tests/ssl/set_ssl_cert.vtc
index 2a8a904..100d343 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert.vtc
+++ b/reg-tests/ssl/set_ssl_cert.vtc
@@ -40,12 +40,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/set_ssl_cert_bundle.vtc b/reg-tests/ssl/set_ssl_cert_bundle.vtc
index eba00de..270cba6 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_bundle.vtc
+++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc
@@ -38,9 +38,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/set_ssl_cert_noext.vtc b/reg-tests/ssl/set_ssl_cert_noext.vtc
index 96a45b6..4326711 100644 (file)
--- a/reg-tests/ssl/set_ssl_cert_noext.vtc
+++ b/reg-tests/ssl/set_ssl_cert_noext.vtc
@@ -32,12 +32,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/set_ssl_crlfile.vtc b/reg-tests/ssl/set_ssl_crlfile.vtc
index 4f358fe..c9ac904 100644 (file)
--- a/reg-tests/ssl/set_ssl_crlfile.vtc
+++ b/reg-tests/ssl/set_ssl_crlfile.vtc
@@ -37,12 +37,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/set_ssl_server_cert.vtc b/reg-tests/ssl/set_ssl_server_cert.vtc
index 880e7b0..2699b37 100644 (file)
--- a/reg-tests/ssl/set_ssl_server_cert.vtc
+++ b/reg-tests/ssl/set_ssl_server_cert.vtc
@@ -26,9 +26,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/show_ssl_ocspresponse.vtc b/reg-tests/ssl/show_ssl_ocspresponse.vtc
index 3809366..0d91fe2 100644 (file)
--- a/reg-tests/ssl/show_ssl_ocspresponse.vtc
+++ b/reg-tests/ssl/show_ssl_ocspresponse.vtc
@@ -36,9 +36,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/ssl_client_auth.vtc b/reg-tests/ssl/ssl_client_auth.vtc
index 885302e..0278ec0 100644 (file)
--- a/reg-tests/ssl/ssl_client_auth.vtc
+++ b/reg-tests/ssl/ssl_client_auth.vtc
@@ -32,9 +32,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/ssl_client_samples.vtc b/reg-tests/ssl/ssl_client_samples.vtc
index 2b6fd5b..81a52ab 100644 (file)
--- a/reg-tests/ssl/ssl_client_samples.vtc
+++ b/reg-tests/ssl/ssl_client_samples.vtc
@@ -21,9 +21,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     listen clear-lst

diff --git a/reg-tests/ssl/ssl_crt-list_filters.vtc b/reg-tests/ssl/ssl_crt-list_filters.vtc
index ad51ec8..099a400 100644 (file)
--- a/reg-tests/ssl/ssl_crt-list_filters.vtc
+++ b/reg-tests/ssl/ssl_crt-list_filters.vtc
@@ -22,12 +22,12 @@ haproxy h1 -conf {
     defaults
         mode http
         option httplog
-        retries 0
+       retries 0
         log stderr local0 debug err
         option logasap
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     listen clear-lst

diff --git a/reg-tests/ssl/ssl_default_server.vtc b/reg-tests/ssl/ssl_default_server.vtc
index 32179b1..485a9ba 100644 (file)
--- a/reg-tests/ssl/ssl_default_server.vtc
+++ b/reg-tests/ssl/ssl_default_server.vtc
@@ -33,9 +33,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     listen clear-lst
         bind "fd@${clearlst}"

diff --git a/reg-tests/ssl/ssl_errors.vtc b/reg-tests/ssl/ssl_errors.vtc
index ad3b82d..1ac6b08 100644 (file)
--- a/reg-tests/ssl/ssl_errors.vtc
+++ b/reg-tests/ssl/ssl_errors.vtc
@@ -147,9 +147,9 @@ haproxy h1 -conf {
     .endif
 
     defaults
-        timeout connect 100ms
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
         retries 0
 
     listen clear_lst

diff --git a/reg-tests/ssl/ssl_frontend_samples.vtc b/reg-tests/ssl/ssl_frontend_samples.vtc
index 92eec6a..e94a37a 100644 (file)
--- a/reg-tests/ssl/ssl_frontend_samples.vtc
+++ b/reg-tests/ssl/ssl_frontend_samples.vtc
@@ -20,9 +20,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     listen clear-lst

diff --git a/reg-tests/ssl/ssl_server_samples.vtc b/reg-tests/ssl/ssl_server_samples.vtc
index 17b1bc4..ebfaad0 100644 (file)
--- a/reg-tests/ssl/ssl_server_samples.vtc
+++ b/reg-tests/ssl/ssl_server_samples.vtc
@@ -22,9 +22,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     listen clear-lst

diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc b/reg-tests/ssl/ssl_simple_crt-list.vtc
index d35c27d..7f15056 100644 (file)
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@@ -22,9 +22,9 @@ haproxy h1 -conf {
         option httplog
         log stderr local0 debug err
         option logasap
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
 
     listen clear-lst

diff --git a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
index 2e859bd..e571810 100644 (file)
--- a/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
+++ b/reg-tests/stick-table/converteers_ref_cnt_never_dec.vtc
@@ -30,9 +30,9 @@ haproxy h1 -conf {
     # Configuration file of 'h1' haproxy instance.
     defaults
         mode   http
-        timeout connect         5s
-        timeout server          30s
-        timeout client          30s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend http1
         bind "fd@${my_frontend_fd}"

diff --git a/reg-tests/stick-table/src_conn_rate.vtc b/reg-tests/stick-table/src_conn_rate.vtc
index 8281ca9..bdf8869 100644 (file)
--- a/reg-tests/stick-table/src_conn_rate.vtc
+++ b/reg-tests/stick-table/src_conn_rate.vtc
@@ -4,9 +4,9 @@ feature ignore_unknown_macro
 haproxy h0 -conf {
        defaults
                mode http
-               timeout connect 5s
-               timeout client 5s
-               timeout server 5s
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
                listen li
                        bind "fd@${fe1}"

diff --git a/reg-tests/stick-table/unknown_key.vtc b/reg-tests/stick-table/unknown_key.vtc
index 980443c..f0307cb 100644 (file)
--- a/reg-tests/stick-table/unknown_key.vtc
+++ b/reg-tests/stick-table/unknown_key.vtc
@@ -12,9 +12,9 @@ server s0 {
 
 haproxy h0 -conf {
        defaults
-               timeout connect 5000ms
-               timeout client 50000ms
-               timeout server 50000ms
+               timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+               timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
        frontend test
                mode http

diff --git a/reg-tests/stickiness/lb-services.vtc b/reg-tests/stickiness/lb-services.vtc
index 28b08b5..a4e016f 100644 (file)
--- a/reg-tests/stickiness/lb-services.vtc
+++ b/reg-tests/stickiness/lb-services.vtc
@@ -46,9 +46,9 @@ server s4 {
 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}"
         log stdout format raw local0  debug
 
     peers mypeers
@@ -109,9 +109,9 @@ server s8 {
 haproxy h2 -arg "-L B" -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}"
 
     peers mypeers
         bind "fd@${B}"

diff --git a/reg-tests/stickiness/srvkey-addr.vtc b/reg-tests/stickiness/srvkey-addr.vtc
index 5001063..99a4d8b 100644 (file)
--- a/reg-tests/stickiness/srvkey-addr.vtc
+++ b/reg-tests/stickiness/srvkey-addr.vtc
@@ -35,9 +35,9 @@ server s2 {
 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}"
         log stdout format raw local0  debug
 
     peers mypeers
@@ -76,9 +76,9 @@ haproxy h1 -arg "-L A" -conf {
 haproxy h2 -arg "-L B" -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}"
 
     peers mypeers
         bind "fd@${B}"

diff --git a/reg-tests/stream/unique-id-from-proxy.vtc b/reg-tests/stream/unique-id-from-proxy.vtc
index 81ee3de..eaac065 100644 (file)
--- a/reg-tests/stream/unique-id-from-proxy.vtc
+++ b/reg-tests/stream/unique-id-from-proxy.vtc
@@ -7,9 +7,9 @@ feature ignore_unknown_macro
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend echo
         bind "fd@${fe1}" accept-proxy

diff --git a/reg-tests/stream/unique-id.vtc b/reg-tests/stream/unique-id.vtc
index ab2df33..3cb5a70 100644 (file)
--- a/reg-tests/stream/unique-id.vtc
+++ b/reg-tests/stream/unique-id.vtc
@@ -12,9 +12,9 @@ server s1 {
 haproxy h1 -conf {
     defaults
         mode http
-        timeout connect 1s
-        timeout client  1s
-        timeout server  1s
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
     frontend stable
         bind "fd@${fe1}"

diff --git a/reg-tests/tcp-rules/default_rules.vtc b/reg-tests/tcp-rules/default_rules.vtc
index a2e8ce9..8c05f43 100644 (file)
--- a/reg-tests/tcp-rules/default_rules.vtc
+++ b/reg-tests/tcp-rules/default_rules.vtc
@@ -13,9 +13,9 @@ server s1 {
 haproxy h1 -conf {
   defaults common
       mode http
-      timeout connect 1s
-      timeout client  1s
-      timeout server  1s
+      timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+      timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+      timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
 
   defaults def_front from common
       tcp-request connection accept