From d37610f43dd8249e3dfbece059159df3dd7e8b51 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 19 Nov 2024 07:43:04 +0100 Subject: [PATCH] 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. --- reg-tests/compression/lua_validation.vtc | 3 +++ reg-tests/connection/h2_glitches.vtc | 3 +++ reg-tests/connection/http_reuse_aggressive.vtc | 3 +++ reg-tests/connection/http_reuse_always.vtc | 3 +++ reg-tests/connection/http_reuse_be_transparent.vtc | 3 +++ reg-tests/connection/http_reuse_conn_hash.vtc | 3 +++ reg-tests/connection/http_reuse_dispatch.vtc | 3 +++ reg-tests/connection/http_reuse_never.vtc | 3 +++ reg-tests/connection/http_reuse_safe.vtc | 3 +++ .../connection/proxy_protocol_send_unique_id.vtc | 3 +++ .../proxy_protocol_send_unique_id_alpn.vtc | 3 +++ reg-tests/connection/tcp_to_http_upgrade.vtc | 5 +++++ reg-tests/http-cookies/h2_cookie_concat.vtc | 3 +++ reg-tests/http-messaging/h2_desync_attacks.vtc | 3 +++ reg-tests/lua/h_txn_get_priv.vtc | 5 +++++ reg-tests/lua/lua_httpclient.vtc | 13 +++++++++---- reg-tests/lua/lua_socket.vtc | 5 +++++ reg-tests/lua/set_var.vtc | 5 +++++ reg-tests/lua/txn_get_priv-thread.vtc | 5 +++++ reg-tests/lua/txn_get_priv.vtc | 5 +++++ reg-tests/lua/wrong_types_usage.vtc | 5 +++++ reg-tests/sample_fetches/cook.vtc | 12 ++++++++++++ reg-tests/sample_fetches/so_name.vtc | 3 +++ reg-tests/server/cli_add_check_server.vtc | 5 +++++ reg-tests/server/cli_add_track_server.vtc | 5 +++++ reg-tests/ssl/crt_store.vtc | 5 +++++ reg-tests/ssl/wrong_ctx_storage.vtc | 5 +++++ reg-tests/startup/default_rules.vtc | 6 ++++++ reg-tests/stats/stats-file.vtc | 5 +++++ .../webstats/webstats-scope-and-post-change.vtc | 3 +++ 30 files changed, 132 insertions(+), 4 deletions(-) diff --git a/reg-tests/compression/lua_validation.vtc b/reg-tests/compression/lua_validation.vtc index b238ce8e9..817820ae1 100644 --- 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 4f25164d0..2bf542f04 100644 --- 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 a7b9ff76c..571a97412 100644 --- 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 f9f00b3fd..8931a0342 100644 --- 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 3fb9e7a20..f83511c61 100644 --- 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 d77f7599a..82d46042b 100644 --- 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 a41972723..ae6dd769f 100644 --- 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 f7fabec4c..d04bdfe59 100644 --- 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 b15f7c003..c554694ab 100644 --- 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 590137ec7..b020ae850 100644 --- 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 09b968efe..7ea30a5a2 100644 --- 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 48ebebaef..39cedd3d5 100644 --- 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 e2e6d8186..f5ae9b973 100644 --- 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 112bc60a4..c638f7d5b 100644 --- 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 bd8c06950..0a846af59 100644 --- 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 0a274932a..bf53b5281 100644 --- 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 83e06a63d..3d0cd1572 100644 --- 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 780c882c3..51b5dfc51 100644 --- 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 953836342..3cf79bdfb 100644 --- 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 71e7bb503..e370d098f 100644 --- 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 ed76579ba..995d42624 100644 --- 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 b0f547215..c1d26ada8 100644 --- 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 72028a2b9..eea17b188 100644 --- 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 c63710c6b..e5b26d76b 100644 --- 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 318f236aa..2377fb2e4 100644 --- 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 685183ed9..a07ec4e2a 100644 --- 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 c6cb19ad5..dd746d46d 100644 --- 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 1cbbfa935..654e9cf3d 100644 --- 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 d7c501a82..8e4aaa9f3 100644 --- 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 e896c05e8..7830ae5b4 100644 --- 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