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 6993d9782f28bab8817c6b73fb38ea8678037b52..ef721fdff70e92bd4aabdeb07876a9baafdc5e6f 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 531e84ea5f6b75d645585990b873c2be0e94b2c2..908a4f9af32f708149660a681ed8c83ecd596bed 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 1a66114d4b513ca878b165c2fae69eb5c5741f28..f1291ee24990b29fe64e83b68a7ed5390ab0b666 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 4dddfe772bd975dcd23f9fe2ee175c737033af5b..cc65d64a367bfa37c82e3b27d698dab36f3c1d8e 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 30f4631087fa6a3bd43c34c177df2169ba03f7a1..d6a8c00b3bacad4de0328ffdbf908f68495a69d2 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 c65bc4ba5d7a810666d8df1cd32afb316c2044b9..b1ea7f97938bf413a8a30db3f4583f02cf3f9c06 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 309c4ae6ad275a50f4a422dde766837bfc7ecd61..ee5cd775ad9a948ca251c8b9493fd2b81c2d5ee2 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 d3c9b70edf93ed4b6bd0347ebf8af315bc2b6ac4..4d6ea6f6a161c31c8ea479c31cdcb6cf6fe7d9d8 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 bb5b9b567669f29cdf97151f72fffd1d75ef5de9..b5ad033bb9590434de97e45f2abbad238c8049cb 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 b24cfd66607e4e233a45232c584e98006b67eeaa..66c89e4e48530687876aecb65101dbefab476a7f 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 add6366eb41ae7f5fcd7d195eb0ad39a45680d6a..c2b1d15be0f7d8ed4f422743257577b16f0fe00d 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 197f822b33a1b1bae498e4bb0567d28f19aa8a11..b1c1bda9cf13647b855d31c47a4d28f226db3aff 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 748c310c3a315934aaa6177d9611959b9002093a..4b828a86a62835bd6f23350c6c8502af1cc89a2b 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 c279972aa8ef52218dfc73d541af4bf94dd5ec8a..d0f3be53ae1827cb3942952c154e25774614e293 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 22f80cd7232bbcb9d1fec9d2177dc357771353b5..05b493d16d9a4ef92f1bae09d8fc86e2c5a4a0be 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 980c184d576494f3b419eb9d20839c20c6525276..88b631ad37b79ac8858bbe9e05ad1079058ba493 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 f9f37a18737044969b4927f90cb9319fed97fa9c..5286bdb8d46f679dddbad67eae39131638398906 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 4bab93474b7cda03fccaa6bd9956caddbb2e2954..2744a6232f14f3092536b3c5fc57c1b0f84839d4 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 12f86d907168e6f98c097f1631251c097bc9e6b1..637eec69ac15351484bd2d9fb119191d79e49956 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 76fd5842f75ae3d2a8c62c6c8d8ee67c2bc227c6..0970ee47fe8f181d58422c61787e79bd311feb20 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 9ece54b2913882139729bacbdb8cd73b836e0ebb..335306075c4fc22f4de765ff2ba4bfc0326c4803 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 c938abc8c48c5bc34c1c4b4c19a1f56ebda91c6a..b6c8ccb494b5e750425c89875e0409d677ee4a1a 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 c50c23e35d3c42ae139570e61711fab8c9bf64cd..a0e550916adfaba2ffe272b23b4bf91dd14a75a7 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 2d20714d578aa2b5c7aa8c3cee03abbd7863fb29..b2348c388b08ee084145dff5fd12735a1ed57057 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 968a18cd74afd3c65fc6bd4a63035340b94ad7ec..417932ee9b0979db0fc6df91e6ed5264ef9c0722 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 c6d4fe4b11acdf99f2dab311dafc791b50450e4d..78b6ed35f46190edd008353fae7565d330194563 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 29d0ddbb8ce1836101d19d251da2814ea5b62dc6..aea129c13f27c932770212847c8399e608916c9d 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 c6b704b12eaae80d39f87fd8b56a7a6a03bb372a..93cef594540fca39fbeba7181ec9488cc6d6c141 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 7f8d9b90e67a3dc4d724b4f7157d2fc37e7bdfc0..49abc0b0036ab0bc52fbc918a6ef92c8d0b7d1f5 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 02dc6f01048fb16232c273983a6bcdef7ec5f163..6ac1782bb9403eb35a977e2b7da3c941dcf36612 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 ab2d11ced984c44b0242ad9fc41921ee8d56605c..81f93e002f5824b80da503ddded77a2148281a76 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 895c83f7969fbadf71b05caa14741e301b1bd81a..356ddf61c140d2e4c663725fc13b1e465a21bcb8 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 995298dfc45f04c6897f51303764ceb9fbcda4fb..04c23ec5352fdf89811b8f192853f913a9a730c6 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 75d7114e55b099076e39f54915a22ebd8de15f7d..1989d6508b8583cfd004c828e080e3319583ab22 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 1df2293029227a741c4eed1fe72a560f8eca0fcd..76ad43dc374401eecee65286eb9772edb8b4a975 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 901a5efa7c6e22282abb981fb34c9f87a94ff5d9..c5684a20ff1da22bbd129b283e33debe0641331a 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 ec6341b3f1aa233fe818b17af924dbcab007955f..8219c734e61c6013440e2a7fab1b4871885876bd 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 fa12bc805ae0734c273c14607427be2d29909e3c..6809d3948a688a29bdb3dd955de08b9ff3dae975 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 fccd6ec4b964fe01bfb8010f8a936ac65e0c5c29..8696b506ebe67a16318210902713c42a35a0ed6d 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 8884daa8c54a64b044e0659ff738e473e0042958..bcaa03cf2db0dc42309a8facb3fe677725fe95b9 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 284bc915139be882921a7f0216afe03a06a42ba2..8c7d734edd22315a6e1ac8739a9fba50fc7d9d72 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 ebe0b87539b32edd6791e14fe57de512a6b63ccb..1ac61335686aa5ac9839700068ee9cf84935c54b 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 bdb90352346ab776d26686409645a6c63a84cef6..540392e2895e49e33d71d9fdabfe2ad5f2f0153b 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 86e50429286388b3453b1273e9e335e5c07c2eda..9d147449c63a0cf00c2dd7921941f2d53a50c697 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 a14f1ccfdfec2fbf66faf346cf55d7781994f192..fab173db55789b84442ad71fb1d96d682186ff48 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 29608fe5bdf6a258ae642fd58434bd7e483d4a79..d8a6130e59b651b11208cd8b61a4ee7cc97d49a7 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 6be46765ba6317f9052fe9682e80b39931cf2e2b..8206da355265a874b46e4c46f464505e1a1e0477 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 f9d9d354adcb8528723310a390598b7882d0f7f7..ef3aa6cf171f1b2f2c0945db9f3e876aaa8e45a4 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 22414e08aa3b9510a53132f9b361206ecf696558..ffd58ee4823ea50e69e970d08f756db54cee93ae 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 b1c5f3800ddd3f97c77e5b969e3bb05f6bbc4658..1f37c9f1f7309ab02d4331f1a0d4c36618f5430a 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 b4209420024fcf9207beac7d8cea2b8c8a92fa1b..1b195a77912eb634e2675289d21f6e6ab4a08ed4 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 d4e319bf28967e42f3bfefcd273125bc1bd9eac8..60458a3fec8a7953e70f3936b34883ad5e776d1b 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 b16e02195c8caaf9536bbdf58fe594d54b95361f..67a7b7def81e7bdc57631a265f2bb922d9fc7eaf 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 6ca021a8b770b27dc8d5a9a131dd19df6f753199..e90e274c2e278071d0e9e4b92860fcc8bea0c348 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 9db3b64efdeeb63926ecefccba6a6d545ffdacc0..d5e317bb2c70109c83d7cc0aa447805b6186e688 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 a3f70ade91e84bc9f5a731be3d77d79db92e053e..74acac8ff14d8dd6fe8956ec995ff5cdbb4f9706 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 650d207e155510fcc1702fd768d0d95eb26b00b3..3d01bccb6fd35b0cddde453f8b45a3ab35f013d7 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 f16b37ed91b5b2a8bf1718794f75da6aedab17b2..1ae210b65c0ecea8d622fa56fbff031cd158832a 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 3c4a06ad232f5015bec726d03a13d7269bbf447c..6b86360ad72af9ed5d32ea6e27d47fc95de2fb8b 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 c8670ae2bd6d6663c8c0467b253e84102c4a2a81..1ace744fad8f3b9a121138c3892c038a64fa1497 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 b03f2ace70638568d1dedb556a917284ba8eae8c..1af909b76ef6ef039f252bae0a5b1bd09348667c 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 3a02af066a13754ba943315bda37a3cfed919186..353045db2428ebb16f4294a0df79394d73004b2f 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 37e08cc8ae3bec5e66d3d3edb1bc53eaaa91ddda..6b20be724d4adb731a74bb08a10ddaa829186af3 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 bc9934eb2f81ed24c912d3fb4abbe2dedb7e9b8b..8db77a9b198fa9d1e56f69b55f06327091bb17ef 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 8d784d681f73bbb362d8a0aba99706a96ba933ff..0d6536698608e7f947095865f80e6bfcd50ce388 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 a5e565732149be86b44964c33d0b05c6dedf3867..852ee4caf9dd2bf07e2a0b8b09536cd157a6454b 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 2df824b2c550861b7d68ad652e164cb306d2a703..9e0ce1c1b3f9d37957b5cb352a0d931a82e52274 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 5e914ef8ae01095a35d2adcdd49f5ec6e19f16e0..2edba7db2d2205c82692a1eab20b2b077b2340f8 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 c41781425a99f2662605843e39e11568341bf880..35cca28629bbb8c349294b78099776f248d97100 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 258b8a9e8e73854d0801c128791bf3edbe53004e..322dfe29acabd9d6ffc9f25cb04c8674a858e687 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 be1ca5b02594d38460de6317f14e8292f9bb697b..a9f819117e7754f0b8eec5eb3189d14dda706a8d 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 3458e772a007312c3cd8b13c2ab6bf0c03e16a22..ebb6328c3014d6de75a75c32c96878529f41b2b3 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 4511a5fea3686b3227fb4e9fefea410559aaeeb0..3edbafbd10f7c70e711298501c69259ec4cf70ef 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 32369a1a3ea34c5ece40d283357c2726016725cd..b26908e14cab4ac6d60d1a4863ef7fae14f9ecac 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 472e5f2f7b27f0b6d1243ea0ff82b49c8076c143..5f4b960e8eac044a0b75bb722365aee3964c1f63 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 4db79a5faa269ef6523e6f9d9afa1719f7be2e49..e61176a7a0c9bffa3671bb1f1580d92c6730b179 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 6628f367a84fee05100735ad5747dedd50cae658..97469b5e64d0e9525774dfc19c9f993a27a5234a 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 3baa33a92d3cc10cd9c39aa06dcd5029d7625252..f4a8fb9d25215ae65b59c77892cdaa6c132d5b88 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 32a7a70a1606fa77300e10ed0948089c30a721d4..0f74a606e1f537c42f980ee237af06ac2f1991b3 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 bb346dda7399bdf89dd6b54a21997aea987d993a..a8591604238516fff823570820ace6e30423c2bf 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 5ae1f9335a8859a16961f37ba0677aebd14d656a..9ae73f70b9bc037cc5e96e16a13ab542e30c2400 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 4263a2ae8e50343b48fb90e4103d7704f264264f..9e7eb604a338b87e66f984bf7b7f40c4584145aa 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 af66498503ce9e7c51283721e02479617561a912..7e8cc1d4e30ad94d342aa0248e30618f3ffd5438 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 8189028047aca21acb8201c3cc77fbe56b91e92b..ae9677539a250f38b82db3d8c91531070c5a8b13 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 67b586b7aa6575ef4534755012c411a7bc14af90..f55e0d82555294865911f3b0fa75afe3935c1e57 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 78af4472178ff1aa3e7e4608a4e9974c9b998375..c3b21fbde7e846b0878461d7da8b31fc26d46168 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 7e2d7491f12fdb8925cbf390ecb45cf8da5c7cbe..129a4b1dbbfa2c04520e3807e33965b65a98f950 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 ce697cab4451cbbb741d7b8e72e90228475aebf2..31e85be668426d16ea5fa0b81cda916fc1293a7e 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 acd2c2413ee5d01a53ebbfddfb616b4ca64a9a02..14e6901459aaa3374c04d237c6023bc91ecda789 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 6840164a97a3f0c23703476cd89ad5e7affe0817..ebaa6a3b4feb396454a207532db6cd7bf8fdc3b2 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 91ead4af6f283239922752516c01042d573d1814..d8afcae5bcc9b25bd6fd2963d4ec06945e31dbac 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 a8978778118c81af419e8a5e3758a1a55c59f27c..22aacaefedaa83256b992864e8b5ca2dcfc79bd0 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 b5a5753fb01b25b7cc755340b4e85af3ca8a64e5..6993b7cbeab57806a7a58cbbf8ec8b1ff31885f9 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 afb71e060fb42e26101d5e8470d672baa60416a9..af8ca8486828abd47b62988f683814a35a3ece4d 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 119f7f670df7d67209a9896e82eb85865b1c6882..5cfdf1a7e6c2e9f94b4ab2d653476ba04ad7b943 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 b6772b04d907ff00a4fef01c1b099987c6d6fe56..7bed3fd8e547d6297f2d694557590f636bbdb6ab 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 e9d8ff6a9108fce4556cd715c31d0c12767b6d55..ae533da3a8a3d5d98c6b80875098ae838580b035 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 eb6f635020fb831c05a1472b52a6a01ebbcc7ec8..a2e0f759e90dc67f77c4c632904b52ab1b9c0c5b 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 1edfae65fe3506d2ab7494687c989fee2195f45e..02449e2aa650ef0be2725a9ddc902173143e467a 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 0dce75f69bf65bebda5c2d5f9998ccd5d1f1a3d8..e4f59e18dbfcf02d39c10b35a4e527f1a13c8167 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 035abbe6c161e8be2aa2e6d22de43e1eae12daba..7b6e9b27aa113bb006e38879c5041a40a657a00a 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 b145ac862960c959be83c8f5110870f41a2962cc..44cd7544d0b18cff3bb046c72bbd80d6d51d6232 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 bcc395229f1f7f2b281ea6571c384cc60643f51e..2c2f60d9345a3035f6441c72b19c122456537bd8 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 d209c6e0d673659e65bfb70aac5bb6479d702a23..900957ef770d75f5c0624c4891f800685d4ba9ef 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 0122bade842422d169c2f5c035c980077d9c9357..8e47d86d2250f25d6ecf0231d82fa95aa961c234 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 8a04718b477d812d9df0cf7447327a52b5a7ff8b..5144e9f4e7a775f2e71284fe52d52d03960421fd 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 5932a78d749626ec2b018799305d782e6cc81da1..2ea8dd3873546badfd6da2388504d4e404c6c2ca 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 670eaac1a21c48aadc51c50abee826c1e0e8baad..fefdb0cc8d49069ff69a2b79c77235cbc60153ae 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 d375152e6c3905332f083c0b5859dcbce69dc31f..242d05953471c7ff745d68e4191f523a7b946415 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 b1ddc4f1d1e5b2e9e4c12166308f426770286849..a8b3036859e462f0eabe7649b0ec573555622a4f 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 68f702bc9c539185c4dcb02e1015d96eef69bfcf..972151816c9995836c4f2ce6dcec98be01f18d0f 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 1b2473d766fb3b5c4809293001eff5b43b1f33ac..396cd21d7c8d0371d5a56bbe1ae07777d00e89b2 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 da003fecb253356e0275e6945b1044c2f1f53ef2..3055f7677bd88a8b931d41e063d9e7480ede3a3b 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 387c2990117a1731ebcd97df068b77c0ff622bf1..093943b00b2da17cbd46a89e8829158a36a16e9f 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 75d8da627d04cfe68afe499daa70d3b0ae1ba01d..152622c5e46756d10544ec96b66c95aa5952a558 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 d3f8d75994aff84229598b649e5599195ea43ec8..5ed72bfe25a796960a42c7f9225bf2765829901a 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 6aa02bf2c673d10245ddf456c63647c95d35ea1d..70dbbb56bb49dc2a17d489ec8057b459b5fb533d 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 3ebc566c0f2860d46c1475a23108e5278fd6603f..166ba2c19c3eb2a0d581011585d61ccb687dc328 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 2c9a0344f0af14539f5e2db7f29e0d8fddf14bac..8658a1a7a5638a56ab906eadba01991827971271 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 f823bf2e50ef48e398b1bc5287ba4bb089ff8ae4..38ee91952f65fda34c98352dbc8e6a098d47eec6 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 2a8a904f2ba1c57502721854a76d669cf186717b..100d34323fa87c9517c0465b87c4874c8d9424ce 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 eba00deca137841d06478a4587ee3696c5e1aabe..270cba6e02dbc8ef123603588303fd6675e07edd 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 96a45b6b18a46f5a1f23686c4b23cb6aab200727..43267110591965608e1e9a2dfd7c7f45cd896ed2 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 4f358feff9b871fa4203b0db79f192ff2fa36603..c9ac904617a8903b897edb3247cf0223d4ccbad3 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 880e7b0c9b6ada6c47923735e12cbf59bc2bfbc0..2699b37c0ad63c09bfb53721028e717e7288f2aa 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 3809366ab74a1698872a3a243d5e46f3dfccc18d..0d91fe2757538bc10fba01cd4cffb87c16ddcb56 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 885302e4740d21b5704c0df3d72828a5d7171a69..0278ec0eaddb14f98ca300a3d7f93a6d004038bc 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 2b6fd5b0b4fc89bc87d12c3e35dc14097a0a1dca..81a52abebf1b8786a9e95c76e474451de53b33c6 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 ad51ec82fd8429feaaf373d18be7d2affe2dc48b..099a400c19a0fdabdf9a81a1fd3446445eb95bc1 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 32179b1f690c769265dbc4b2d696bbb9c411573f..485a9ba17162da6ff371de265929a79b4a2a34ec 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 ad3b82deb03de2e5215448b482bbbb72f7699677..1ac6b087cacf244f2b62829a33781cbcf33d69d8 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 92eec6ac113802ed58cb61d241c8893d164ab0ce..e94a37a87f2169bcc8adfead8af432c397fad0aa 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 17b1bc4389fa0a1437cf6691a10f3c6c71156d6a..ebfaad06577d5223054252842bafdb5b247fb557 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 d35c27d676e016fef2e980ccd33ba2b1772aa296..7f150561b9395d7500f5763f60afcf45ed3e4435 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 2e859bdb530829b36803e5acc1c6597c00129dad..e571810ad3e3cf1665faccf49d6d4e81f3fc6024 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 8281ca935e5eed8f087bb73f0191c534143d6893..bdf8869bee30bbb154107aba886e64166610b42a 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 980443c01e71f27b426859851de89fa76309506f..f0307cb210075e880944713647c34d8c5c4bd60c 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 28b08b534077582c423ba335a9cc9198070bfbe3..a4e016f5dd00c8007aaf9f094ff2685a11f5787f 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 5001063b7af95ece1bb359e7f4323345b716656b..99a4d8b71fe6eead1e89e32f7a190e0fc7165230 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 81ee3dea95cb5d631d3cbfececb758048b0c1e91..eaac065970e77fb14d5340f94815faf97780169a 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 ab2df33b6225b67f9ba6b211e497a0981d235091..3cb5a705f5b7ab76b2bab71e4687f2e655a9f116 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 a2e8ce9efa2a39194febdef9119849afac810a59..8c05f4306bbfc921efce1afa1163bf4cd483bc45 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