From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Thu, 5 Sep 2024 14:48:32 +0000 (+0200)
Subject: REGTESTS: log: fix log-profile.vtc
X-Git-Tag: v3.1-dev9~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdaa749ba0778fb5ffd7797df5be9c9387005eca;p=thirdparty%2Fhaproxy.git

REGTESTS: log: fix log-profile.vtc

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.
---

diff --git a/reg-tests/log/log_profiles.vtc b/reg-tests/log/log_profiles.vtc
index 552fb32439..35be42082c 100644
--- a/reg-tests/log/log_profiles.vtc
+++ b/reg-tests/log/log_profiles.vtc
@@ -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