REGTESTS: add missing timeouts to 30 tests

No less than 30 tests were missing timeouts, preventing them from being
started with zero-warning. Since they were not supposed to trigger, they
have been set to 30s so as never to trigger, and now they do not produce
any warning anymore.

diff --git a/reg-tests/compression/lua_validation.vtc b/reg-tests/compression/lua_validation.vtc
index b238ce8e9520c91e9904148ffca0049c3b0cbb40..817820ae17a00ab361eb609571962a7840bd51ee 100644 (file)
--- a/reg-tests/compression/lua_validation.vtc
+++ b/reg-tests/compression/lua_validation.vtc
@@ -11,6 +11,9 @@ global
        lua-load                ${testdir}/lua_validation.lua
 
 defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
        mode                    http
 
 frontend main-https

diff --git a/reg-tests/connection/h2_glitches.vtc b/reg-tests/connection/h2_glitches.vtc
index 4f25164d0406acbb15cb5bb82bf3e5f62b725ef6..2bf542f04a1ef43ac00292e0375f6d31577dd108 100644 (file)
--- a/reg-tests/connection/h2_glitches.vtc
+++ b/reg-tests/connection/h2_glitches.vtc
@@ -7,6 +7,9 @@ feature ignore_unknown_macro
 # haproxy frontend
 haproxy hap -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        listen fe1

diff --git a/reg-tests/connection/http_reuse_aggressive.vtc b/reg-tests/connection/http_reuse_aggressive.vtc
index a7b9ff76c41ce8bffed827bd0e629676f3d4ff6f..571a974120e7190ebe138d0682a3b666a93ce199 100644 (file)
--- a/reg-tests/connection/http_reuse_aggressive.vtc
+++ b/reg-tests/connection/http_reuse_aggressive.vtc
@@ -4,6 +4,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        listen sender

diff --git a/reg-tests/connection/http_reuse_always.vtc b/reg-tests/connection/http_reuse_always.vtc
index f9f00b3fd0081074ed9ce9c3dc3b97f37399b9cf..8931a03427eb66ff44a29a127c0d11bcbada6fdc 100644 (file)
--- a/reg-tests/connection/http_reuse_always.vtc
+++ b/reg-tests/connection/http_reuse_always.vtc
@@ -4,6 +4,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -W -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        listen sender

diff --git a/reg-tests/connection/http_reuse_be_transparent.vtc b/reg-tests/connection/http_reuse_be_transparent.vtc
index 3fb9e7a20cf2add46d266d36c7b657299a8041b1..f83511c61df2046c2b344733b1b805d016a84c52 100644 (file)
--- a/reg-tests/connection/http_reuse_be_transparent.vtc
+++ b/reg-tests/connection/http_reuse_be_transparent.vtc
@@ -11,6 +11,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        listen sender

diff --git a/reg-tests/connection/http_reuse_conn_hash.vtc b/reg-tests/connection/http_reuse_conn_hash.vtc
index d77f7599addc321f90b366d7424a8b8877c62dc8..82d46042b1e4728ec36de080cff1b940f38de385 100644 (file)
--- a/reg-tests/connection/http_reuse_conn_hash.vtc
+++ b/reg-tests/connection/http_reuse_conn_hash.vtc
@@ -6,6 +6,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        # sni

diff --git a/reg-tests/connection/http_reuse_dispatch.vtc b/reg-tests/connection/http_reuse_dispatch.vtc
index a41972723def0fea5aa79c17d7260ac43331be73..ae6dd769f78f271836160be520fb68b71f2a90c1 100644 (file)
--- a/reg-tests/connection/http_reuse_dispatch.vtc
+++ b/reg-tests/connection/http_reuse_dispatch.vtc
@@ -10,6 +10,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        listen sender

diff --git a/reg-tests/connection/http_reuse_never.vtc b/reg-tests/connection/http_reuse_never.vtc
index f7fabec4c0d4d84b53420724395878edfaa94295..d04bdfe59a6fbcab1bd409e1307408734c8c8e8e 100644 (file)
--- a/reg-tests/connection/http_reuse_never.vtc
+++ b/reg-tests/connection/http_reuse_never.vtc
@@ -4,6 +4,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        # limit idle pool to one connection

diff --git a/reg-tests/connection/http_reuse_safe.vtc b/reg-tests/connection/http_reuse_safe.vtc
index b15f7c0032b37e898ab36274b723effe3104d1e0..c554694ab674e13b2c6b67655034f199723f4a93 100644 (file)
--- a/reg-tests/connection/http_reuse_safe.vtc
+++ b/reg-tests/connection/http_reuse_safe.vtc
@@ -4,6 +4,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        # limit idle pool to one connection

diff --git a/reg-tests/connection/proxy_protocol_send_unique_id.vtc b/reg-tests/connection/proxy_protocol_send_unique_id.vtc
index 590137ec7830565d1734448ce27080b5ac9c8eb7..b020ae850cdc57180a0dd54987d61e9aa601f9ad 100644 (file)
--- a/reg-tests/connection/proxy_protocol_send_unique_id.vtc
+++ b/reg-tests/connection/proxy_protocol_send_unique_id.vtc
@@ -4,6 +4,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
         log global
         unique-id-format %{+X}o\ TEST-%[req.hdr(in)]

diff --git a/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc b/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
index 09b968efe607f33b980854bcca15c9432d87bfe2..7ea30a5a2ba8cc1af4046645d27821bbcaf9a106 100644 (file)
--- a/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
+++ b/reg-tests/connection/proxy_protocol_send_unique_id_alpn.vtc
@@ -6,6 +6,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
         log global
         unique-id-format %{+X}o\ TEST-%[req.hdr(in)]

diff --git a/reg-tests/connection/tcp_to_http_upgrade.vtc b/reg-tests/connection/tcp_to_http_upgrade.vtc
index 48ebebaef7649b9ab7ae709d28bfe81cd25ca82c..39cedd3d5d345faf45acc30f68ed41278ef61552 100644 (file)
--- a/reg-tests/connection/tcp_to_http_upgrade.vtc
+++ b/reg-tests/connection/tcp_to_http_upgrade.vtc
@@ -44,6 +44,11 @@ server s1 {
 } -start
 
 haproxy h1 -conf {
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode tcp
         bind "fd@${fe1h1}"

diff --git a/reg-tests/http-cookies/h2_cookie_concat.vtc b/reg-tests/http-cookies/h2_cookie_concat.vtc
index e2e6d8186b1aba10b559bf9a997fd6935b7bed9a..f5ae9b9732c3a111298a54b4e53e66aca14b96c1 100644 (file)
--- a/reg-tests/http-cookies/h2_cookie_concat.vtc
+++ b/reg-tests/http-cookies/h2_cookie_concat.vtc
@@ -9,6 +9,9 @@ server s1 {
 
 haproxy h1 -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        frontend fe1

diff --git a/reg-tests/http-messaging/h2_desync_attacks.vtc b/reg-tests/http-messaging/h2_desync_attacks.vtc
index 112bc60a4c426303814e2f062a772bbcc09e67f5..c638f7d5b0fafc5233b3f20518446450309264e3 100644 (file)
--- a/reg-tests/http-messaging/h2_desync_attacks.vtc
+++ b/reg-tests/http-messaging/h2_desync_attacks.vtc
@@ -15,6 +15,9 @@ server s1 {
 # haproxy frontend
 haproxy hap -conf {
        defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
                mode http
 
        listen feSrvH1

diff --git a/reg-tests/lua/h_txn_get_priv.vtc b/reg-tests/lua/h_txn_get_priv.vtc
index bd8c0695068865514f5b1eebd12bd6b309324384..0a846af5951548a5d728924a61d49b7f9d65cd9e 100644 (file)
--- a/reg-tests/lua/h_txn_get_priv.vtc
+++ b/reg-tests/lua/h_txn_get_priv.vtc
@@ -7,6 +7,11 @@ haproxy h1 -conf {
     global
         lua-load ${testdir}/h_txn_get_priv.lua
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode http
         bind "fd@${fe1}"

diff --git a/reg-tests/lua/lua_httpclient.vtc b/reg-tests/lua/lua_httpclient.vtc
index 0a274932ab237d8da3a411efca1ccc75ba4815c6..bf53b5281775a4a1044bbdb9d05f18857ac893a6 100644 (file)
--- a/reg-tests/lua/lua_httpclient.vtc
+++ b/reg-tests/lua/lua_httpclient.vtc
@@ -40,6 +40,11 @@ haproxy h1 -conf {
     global
         lua-load ${testdir}/lua_httpclient.lua
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode http
         bind "fd@${fe1}"
@@ -49,10 +54,10 @@ haproxy h1 -conf {
         mode http
         http-request use-service lua.fakeserv
 
-   listen li1
-       mode http
-       bind unix@${tmpdir}/srv3
-       server srv3 ${s3_addr}:${s3_port}
+    listen li1
+        mode http
+        bind unix@${tmpdir}/srv3
+        server srv3 ${s3_addr}:${s3_port}
 
 } -start
 

diff --git a/reg-tests/lua/lua_socket.vtc b/reg-tests/lua/lua_socket.vtc
index 83e06a63d60bd34a084f4096b57c68554f2d4d69..3d0cd1572789005e70e75e42878e1db6d8887a6c 100644 (file)
--- a/reg-tests/lua/lua_socket.vtc
+++ b/reg-tests/lua/lua_socket.vtc
@@ -12,6 +12,11 @@ haproxy h1 -conf {
     global
         lua-load ${testdir}/lua_socket.lua
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode http
         bind "fd@${fe1}"

diff --git a/reg-tests/lua/set_var.vtc b/reg-tests/lua/set_var.vtc
index 780c882c3cfd99b9fc7e45c94ff7a44abbe3db7b..51b5dfc5125b3dedd0ef0b88deb057cdc41e92b5 100644 (file)
--- a/reg-tests/lua/set_var.vtc
+++ b/reg-tests/lua/set_var.vtc
@@ -13,6 +13,11 @@ haproxy h1 -conf {
     global
         lua-load ${testdir}/set_var.lua
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode http
         bind "fd@${fe1}"

diff --git a/reg-tests/lua/txn_get_priv-thread.vtc b/reg-tests/lua/txn_get_priv-thread.vtc
index 95383634293dcc9f6e661add134414b7955c133a..3cf79bdfb1535726c41ec2a872c14b1ecc958246 100644 (file)
--- a/reg-tests/lua/txn_get_priv-thread.vtc
+++ b/reg-tests/lua/txn_get_priv-thread.vtc
@@ -15,6 +15,11 @@ haproxy h1 -conf {
         lua-load-per-thread ${testdir}/txn_get_priv.lua
         lua-load-per-thread ${testdir}/txn_get_priv-print_r.lua
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode http
         bind "fd@${fe1}"

diff --git a/reg-tests/lua/txn_get_priv.vtc b/reg-tests/lua/txn_get_priv.vtc
index 71e7bb50303b171a45af34bff3bbee6f482a6086..e370d098fcc339e6aad1804dd896b141203c557d 100644 (file)
--- a/reg-tests/lua/txn_get_priv.vtc
+++ b/reg-tests/lua/txn_get_priv.vtc
@@ -9,6 +9,11 @@ haproxy h1 -conf {
         lua-load ${testdir}/txn_get_priv.lua
         lua-load ${testdir}/txn_get_priv-print_r.lua
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode http
         bind "fd@${fe1}"

diff --git a/reg-tests/lua/wrong_types_usage.vtc b/reg-tests/lua/wrong_types_usage.vtc
index ed76579ba2d7e4671fe71bb14d027dfc01abe308..995d42624dbe1747d24a8e11ff5d09abf1eb2ce1 100644 (file)
--- a/reg-tests/lua/wrong_types_usage.vtc
+++ b/reg-tests/lua/wrong_types_usage.vtc
@@ -45,6 +45,11 @@ haproxy h1 -conf {
     global
         lua-load ${testdir}/wrong_types_usage.lua
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     frontend fe1
         mode http
         bind "fd@${fe1}"

diff --git a/reg-tests/sample_fetches/cook.vtc b/reg-tests/sample_fetches/cook.vtc
index b0f547215ed01aaf84f858225eae7eb4ec7ac1a3..c1d26ada82f05a86cda122c5dcafabadae3f08e5 100644 (file)
--- a/reg-tests/sample_fetches/cook.vtc
+++ b/reg-tests/sample_fetches/cook.vtc
@@ -11,6 +11,9 @@ server s1 {
 
 haproxy h1 -conf {
     defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
 
     frontend fe
@@ -50,6 +53,9 @@ server s2 {
 
 haproxy h2 -conf {
     defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
 
     frontend fe
@@ -79,6 +85,9 @@ server s3 {
 
 haproxy h3 -conf {
     defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
 
     frontend fe
@@ -111,6 +120,9 @@ server s4 {
 
 haproxy h4 -conf {
     defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
 
     frontend fe

diff --git a/reg-tests/sample_fetches/so_name.vtc b/reg-tests/sample_fetches/so_name.vtc
index 72028a2b9fef7f6f277f9c0447f758a69d024954..eea17b188fb72d781b916b0394f7c7215f8cb74f 100644 (file)
--- a/reg-tests/sample_fetches/so_name.vtc
+++ b/reg-tests/sample_fetches/so_name.vtc
@@ -4,6 +4,9 @@ feature ignore_unknown_macro
 
 haproxy h1 -conf {
     defaults
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
 
     frontend fe

diff --git a/reg-tests/server/cli_add_check_server.vtc b/reg-tests/server/cli_add_check_server.vtc
index c63710c6bf5aae9ff1633f64752c0aeaeb40bc92..e5b26d76bde3f95a6044f40bea41597b1f6f7e92 100644 (file)
--- a/reg-tests/server/cli_add_check_server.vtc
+++ b/reg-tests/server/cli_add_check_server.vtc
@@ -66,6 +66,11 @@ haproxy h1 -conf {
        global
                stats socket "${tmpdir}/h1/stats" level admin
 
+       defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
+
        backend be1
                option log-health-checks
                option httpchk GET /

diff --git a/reg-tests/server/cli_add_track_server.vtc b/reg-tests/server/cli_add_track_server.vtc
index 318f236aa5b5586f61412a550c0c2a6edd2b3d42..2377fb2e48ebddc8f25baf61e2cdee768798362a 100644 (file)
--- a/reg-tests/server/cli_add_track_server.vtc
+++ b/reg-tests/server/cli_add_track_server.vtc
@@ -93,6 +93,11 @@ haproxy h1 -conf {
        global
                stats socket "${tmpdir}/h1/stats" level admin
 
+       defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
+
        backend be_check
                server srv_check ${s1_addr}:${s1_port} check
                server srv_no_check ${s1_addr}:${s1_port}

diff --git a/reg-tests/ssl/crt_store.vtc b/reg-tests/ssl/crt_store.vtc
index 685183ed93aba970df0af18f03c78d494a4f3d15..a07ec4e2a2a860bdd810816f0e0e12fdb7e08161 100644 (file)
--- a/reg-tests/ssl/crt_store.vtc
+++ b/reg-tests/ssl/crt_store.vtc
@@ -14,6 +14,11 @@ haproxy h1 -arg -V -conf-OK {
     crt-store
        load crt "${testdir}/common.crt" key "${testdir}/common.key"
 
+    defaults
+        timeout client 30s
+        timeout server 30s
+        timeout connect 30s
+
     listen ssl-lst
         bind "${tmpdir}/ssl.sock" ssl crt ${testdir}/common.crt strict-sni
 

diff --git a/reg-tests/ssl/wrong_ctx_storage.vtc b/reg-tests/ssl/wrong_ctx_storage.vtc
index c6cb19ad5c140e4558c65a002edfe2be19cb6c9a..dd746d46d1dce8fb186d6c01923528b2e265dd87 100644 (file)
--- a/reg-tests/ssl/wrong_ctx_storage.vtc
+++ b/reg-tests/ssl/wrong_ctx_storage.vtc
@@ -27,6 +27,11 @@ haproxy h1 -conf {
     tune.ssl.default-dh-param 2048
     tune.ssl.capture-buffer-size 1
 
+  defaults
+    timeout client 30s
+    timeout server 30s
+    timeout connect 30s
+
   listen frt
     mode http
     bind "fd@${frt}" ssl crt ${testdir}/common.pem

diff --git a/reg-tests/startup/default_rules.vtc b/reg-tests/startup/default_rules.vtc
index 1cbbfa935650faf2f0903599a07c004110939023..654e9cf3db116cf280ce393ee6d1623623f7b611 100644 (file)
--- a/reg-tests/startup/default_rules.vtc
+++ b/reg-tests/startup/default_rules.vtc
@@ -129,6 +129,9 @@ haproxy h13 -conf-BAD {} {
 
 haproxy h14 -arg -V -conf-OK {
     defaults tcp
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         tcp-response inspect-delay 5s
         tcp-response content accept
 
@@ -164,6 +167,9 @@ haproxy h16 -conf-BAD {} {
 
 haproxy h17 -arg -V -conf-OK {
     defaults common
+       timeout client 30s
+       timeout server 30s
+       timeout connect 30s
         mode http
 
     defaults def_front from common

diff --git a/reg-tests/stats/stats-file.vtc b/reg-tests/stats/stats-file.vtc
index d7c501a82172cdbb42108aebe7bb72fb4aa70f34..8e4aaa9f34f55cc28cae61271565dca810614d74 100644 (file)
--- a/reg-tests/stats/stats-file.vtc
+++ b/reg-tests/stats/stats-file.vtc
@@ -7,6 +7,11 @@ haproxy h1 -conf {
        global
                stats-file ${testdir}/sample-stats-file
 
+       defaults
+               timeout client 30s
+               timeout server 30s
+               timeout connect 30s
+
        frontend fe
                guid guid-fe
                bind "fd@${feS}" guid-prefix guid-feS

diff --git a/reg-tests/webstats/webstats-scope-and-post-change.vtc b/reg-tests/webstats/webstats-scope-and-post-change.vtc
index e896c05e8364c9894d1d49be7c9ebc86c9043c91..7830ae5b45dd150f19229dc5c94915f5668251d3 100644 (file)
--- a/reg-tests/webstats/webstats-scope-and-post-change.vtc
+++ b/reg-tests/webstats/webstats-scope-and-post-change.vtc
@@ -13,6 +13,9 @@ haproxy h1 -conf {
     tune.idle-pool.shared off
 
   defaults
+    timeout client 30s
+    timeout server 30s
+    timeout connect 30s
     mode http
 
   frontend fe1