From: William Lallemand <wlallemand@haproxy.com>
Date: Fri, 17 Nov 2023 16:11:42 +0000 (+0100)
Subject: REGTESTS: try to activate again the seamless reload test with the master CLI
X-Git-Tag: v2.9-dev10~38
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=3379441e26621717522136766768655351873ca6;p=haproxy-3.0.git

REGTESTS: try to activate again the seamless reload test with the master CLI

Since the reload is now synchronous over the master CLI, try to reload
with it. This was a problem before with the signals because it wasn't
possible to wait for the end of the reload before sending the requests.

This activate again this test, we will see if it's more stable or we
will deactivate it again..
---

diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index ce1b156..e8e5f28 100644
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -16,12 +16,14 @@
 
 varnishtest "Seamless reload issue with abns sockets"
 feature ignore_unknown_macro
+feature cmd "command -v socat"
+feature cmd "command -v grep"
 
 # abns@ sockets are not available on freebsd
 #EXCLUDE_TARGETS=freebsd,osx,generic
-#REGTEST_TYPE=broken
+#REGTEST_TYPE=devel
 
-haproxy h1 -W -conf {
+haproxy h1 -W -S -conf {
   global
     stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners
 
@@ -43,7 +45,7 @@ haproxy h1 -W -conf {
 } -start
 
 shell {
-  kill -USR2 $(cat "${tmpdir}/h1/pid")
+    echo "reload" | socat -t1000 TCP:${h1_mcli_addr}:${h1_mcli_port} - | grep 'Success=1'
 }
 
 client c1 -connect ${h1_testme_sock} {