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.
This commit is contained in:
parent
52b72ec3ba
commit
d37610f43d
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,6 +6,9 @@ feature ignore_unknown_macro
|
|||
|
||||
haproxy h1 -conf {
|
||||
defaults
|
||||
timeout client 30s
|
||||
timeout server 30s
|
||||
timeout connect 30s
|
||||
mode http
|
||||
|
||||
# sni
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)]
|
||||
|
|
|
@ -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)]
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -9,6 +9,9 @@ server s1 {
|
|||
|
||||
haproxy h1 -conf {
|
||||
defaults
|
||||
timeout client 30s
|
||||
timeout server 30s
|
||||
timeout connect 30s
|
||||
mode http
|
||||
|
||||
frontend fe1
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 /
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue