mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

REGTESTS: silence the "log format ignored" warnings

Browse Source 
Several tests were declaring a log format without having an explicit
log server configured, causing a warning. Let's clean them up.
This commit is contained in:
Willy Tarreau 2024-11-19 07:46:26 +01:00
parent e72b525832
commit 671f6beac1
7 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reg-tests/checks/tls_health_checks.vtc
View File

@ -58,12 +58,10 @@ haproxy h1 -conf {
use_backend be1 use_backend be1
frontend fe2 frontend fe2
option tcplog
bind "fd@${fe2}" ssl crt ${testdir}/common.pem bind "fd@${fe2}" ssl crt ${testdir}/common.pem
use_backend be2 use_backend be2
frontend fe3 frontend fe3
option httplog
bind "fd@${fe3}" ssl crt ${testdir}/common.pem bind "fd@${fe3}" ssl crt ${testdir}/common.pem
use_backend be3 use_backend be3
} -start } -start

3
reg-tests/compression/lua_validation.vtc
View File

@ -8,13 +8,10 @@ feature ignore_unknown_macro
haproxy h1 -conf { haproxy h1 -conf {
global global
# log stdout format short daemon
lua-load ${testdir}/lua_validation.lua lua-load ${testdir}/lua_validation.lua
defaults defaults
mode http mode http
log global
option httplog
frontend main-https frontend main-https
bind "fd@${fe1}" ssl crt ${testdir}/common.pem bind "fd@${fe1}" ssl crt ${testdir}/common.pem

4
reg-tests/http-rules/converters_ipmask_concat_strcmp_field_word.vtc
View File

@ -75,8 +75,6 @@ server s2 {
haproxy h1 -conf { haproxy h1 -conf {
defaults defaults
mode http mode http
log global
option httplog
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
timeout server "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
@ -136,8 +134,6 @@ haproxy h1 -conf {
haproxy h2 -conf { haproxy h2 -conf {
defaults defaults
mode http mode http
log global
option httplog
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
timeout server "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

3
reg-tests/http-rules/map_redirect.vtc
View File

@ -35,7 +35,6 @@ haproxy h1 -conf {
defaults defaults
mode http mode http
log global log global
option httplog
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
timeout server "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
@ -63,7 +62,7 @@ haproxy h1 -conf {
default_backend be1 default_backend be1
backend be1 backend be1
http-request redirect prefix %[var(txn.testvar)] code 301 if { var(txn.testvar) -m found } http-request redirect prefix %[var(txn.testvar)] code 301 if { var(txn.testvar) -m found }
http-request deny http-request deny

2
reg-tests/sample_fetches/acl.vtc
View File

@ -19,8 +19,6 @@ haproxy h1 -conf {
acl ACL4 acl(ACL2,!ACL3) acl ACL4 acl(ACL2,!ACL3)
http-request return status 200 hdr x-acl "ACL1=%[acl(ACL1)] ACL2=%[acl(ACL2)] ACL3=%[acl(ACL3)] ACL4=%[acl(ACL4)] TRUE=%[acl(TRUE)]" http-request return status 200 hdr x-acl "ACL1=%[acl(ACL1)] ACL2=%[acl(ACL2)] ACL3=%[acl(ACL3)] ACL4=%[acl(ACL4)] TRUE=%[acl(TRUE)]"
log-format ACL1=%[acl(ACL1)]
} -start } -start
client c1 -connect ${h1_fe1_sock} { client c1 -connect ${h1_fe1_sock} {

2
reg-tests/seamless-reload/abns_socket.vtc
View File

@ -29,8 +29,6 @@ haproxy h1 -W -S -conf {
defaults defaults
mode http mode http
log global
option httplog
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
timeout server "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}"

2
reg-tests/server/abnsz.vtc
View File

@ -12,8 +12,6 @@ haproxy h1 -W -S -conf {
defaults defaults
mode http mode http
log global
option httplog
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
timeout server "${HAPROXY_TEST_TIMEOUT-5s}" timeout server "${HAPROXY_TEST_TIMEOUT-5s}"