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.

diff --git a/reg-tests/checks/tcp-check_min-recv.vtc b/reg-tests/checks/tcp-check_min-recv.vtc
index b5b2aabb7782980959a501eb85c9f3f075b739f2..83f4c6b913616416158c2bf8f8c618257cab0e8b 100644 (file)
--- 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 0109fbc8d684266f6c3059f3087ab5bc06748a89..44312af9fe8ca47c5cc4ae53a3bc2e427caaf46d 100644 (file)
--- 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