mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-03-31 23:58:16 +00:00
REGTESTS: log: fix log-profile.vtc
Add missing wait for Slg4 introduced inf8299bc
("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 unlessf8299bc
is.
This commit is contained in:
parent
fdf38ed7fc
commit
cdaa749ba0
@ -5,7 +5,7 @@ feature ignore_unknown_macro
|
||||
barrier b1 cond 4 -cyclic
|
||||
barrier b2 cond 4 -cyclic
|
||||
barrier b3 cond 3 -cyclic
|
||||
barrier b4 cond 2 -cyclic
|
||||
barrier b4 cond 3 -cyclic
|
||||
|
||||
server s1 {
|
||||
rxreq
|
||||
@ -69,7 +69,7 @@ syslog Slg3 -level info {
|
||||
syslog Slg4 -level info {
|
||||
recv
|
||||
#rfc5424, logprof3, tcp error (other steps should be dropped)
|
||||
expect ~ ".* custom ${h1_pid} .* error"
|
||||
expect ~ ".* haproxy ${h1_pid} .* error"
|
||||
barrier b4 sync
|
||||
} -start
|
||||
|
||||
@ -118,6 +118,7 @@ haproxy h1 -conf {
|
||||
mode http
|
||||
log-format "%B"
|
||||
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
|
||||
on close format "close" sd "sdclose"
|
||||
@ -181,3 +182,4 @@ barrier b4 sync
|
||||
syslog Slg1 -wait
|
||||
syslog Slg2 -wait
|
||||
syslog Slg3 -wait
|
||||
syslog Slg4 -wait
|
||||
|
Loading…
Reference in New Issue
Block a user