From 6d70da76d300d9c6965943807f44a713a8005ff9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 19 Nov 2024 07:50:54 +0100 Subject: [PATCH] REGTESTS: make the unit explicit for very short timeouts Two tests were using "timeout {client,server} 1" to forcefully trigger them, but a forthcoming patch will emit a warning for such small unitless values, so let's be explicit about the unit. --- reg-tests/checks/tcp-check_min-recv.vtc | 4 ++-- reg-tests/log/wrong_ip_port_logging.vtc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reg-tests/checks/tcp-check_min-recv.vtc b/reg-tests/checks/tcp-check_min-recv.vtc index b5b2aabb7..83f4c6b91 100644 --- a/reg-tests/checks/tcp-check_min-recv.vtc +++ b/reg-tests/checks/tcp-check_min-recv.vtc @@ -39,8 +39,8 @@ haproxy h1 -conf { backend be1 # must fail fast - timeout check 1 - timeout server 1 + timeout check 1ms + timeout server 1ms log ${S1_addr}:${S1_port} len 2048 local0 option tcp-check option log-health-checks diff --git a/reg-tests/log/wrong_ip_port_logging.vtc b/reg-tests/log/wrong_ip_port_logging.vtc index 0109fbc8d..44312af9f 100644 --- a/reg-tests/log/wrong_ip_port_logging.vtc +++ b/reg-tests/log/wrong_ip_port_logging.vtc @@ -40,7 +40,7 @@ haproxy h1 -conf { defaults log global timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" - timeout client 1 + timeout client 1ms timeout server "${HAPROXY_TEST_TIMEOUT-5s}" frontend fe1