From 3379441e26621717522136766768655351873ca6 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Fri, 17 Nov 2023 17:11:42 +0100 Subject: [PATCH] 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.. --- reg-tests/seamless-reload/abns_socket.vtc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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} { -- 1.7.10.4