1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REGTESTS: log: fix log-profile.vtc

Browse Source 
Add missing wait for Slg4 introduced in f8299bc ("MINOR: log: "drop"
support for log-profile steps"), and missing barrier increase due to
the use of barrier sync, which could have resulted in the regtest
being timing-sentive and thus less-reliable.

Also, the "error" check in Slg4 wasn't even considered because it is
emitted by frontend 4, not frontend 2..

No backport needed unless f8299bc is.
This commit is contained in:
Aurelien DARRAGON 2024-09-05 16:48:32 +02:00
parent fdf38ed7fc
commit cdaa749ba0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reg-tests/log/log_profiles.vtc
View File

@ -5,7 +5,7 @@ feature ignore_unknown_macro
barrier b1 cond 4 -cyclic barrier b1 cond 4 -cyclic
barrier b2 cond 4 -cyclic barrier b2 cond 4 -cyclic
barrier b3 cond 3 -cyclic barrier b3 cond 3 -cyclic
barrier b4 cond 2 -cyclic barrier b4 cond 3 -cyclic
server s1 { server s1 {
rxreq rxreq
@ -69,7 +69,7 @@ syslog Slg3 -level info {
syslog Slg4 -level info { syslog Slg4 -level info {
recv recv
#rfc5424, logprof3, tcp error (other steps should be dropped) #rfc5424, logprof3, tcp error (other steps should be dropped)
expect ~ ".* custom ${h1_pid} .* error" expect ~ ".* haproxy ${h1_pid} .* error"
barrier b4 sync barrier b4 sync
} -start } -start
@ -118,6 +118,7 @@ haproxy h1 -conf {
mode http mode http
log-format "%B" log-format "%B"
log udp@${Slg3_addr}:${Slg3_port} format rfc5424 profile logprof2 local0 log udp@${Slg3_addr}:${Slg3_port} format rfc5424 profile logprof2 local0
log udp@${Slg4_addr}:${Slg4_port} format rfc5424 profile logprof3 local0
log-profile logprof1 log-profile logprof1
on close format "close" sd "sdclose" on close format "close" sd "sdclose"
@ -181,3 +182,4 @@ barrier b4 sync
syslog Slg1 -wait syslog Slg1 -wait
syslog Slg2 -wait syslog Slg2 -wait
syslog Slg3 -wait syslog Slg3 -wait
syslog Slg4 -wait