From b7d81b351156e75b2a4ceda4b3dcf0d1bf561386 Mon Sep 17 00:00:00 2001
From: William Lallemand <wlallemand@haproxy.com>
Date: Wed, 20 Nov 2024 10:57:42 +0100
Subject: [PATCH] REGTESTS: switch to -Ws for master-worker reg-tests

The -W mode implemented in VTest is not reliable anymore, because VTest
waits for the pidfile to be created. But with the new master-worker
mode, this file is created long before haproxy is ready. This can lead
to the test being started too soon, and failing from time to time.

The -Ws option allows to wait for haproxy to deliver a message to VTest
once it is ready.
---
 reg-tests/connection/http_reuse_always.vtc | 2 +-
 reg-tests/http-rules/acl_cli_spaces.vtc    | 2 +-
 reg-tests/mcli/mcli_debug_dev.vtc          | 2 +-
 reg-tests/mcli/mcli_show_info.vtc          | 2 +-
 reg-tests/mcli/mcli_start_progs.vtc        | 2 +-
 reg-tests/seamless-reload/abns_socket.vtc  | 2 +-
 reg-tests/server/abnsz.vtc                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/reg-tests/connection/http_reuse_always.vtc b/reg-tests/connection/http_reuse_always.vtc
index 8931a03427..8f70367f8f 100644
--- a/reg-tests/connection/http_reuse_always.vtc
+++ b/reg-tests/connection/http_reuse_always.vtc
@@ -2,7 +2,7 @@ varnishtest "Test the http-reuse always mode"
 
 feature ignore_unknown_macro
 
-haproxy h1 -W -conf {
+haproxy h1 -Ws -conf {
 	defaults
 		timeout client 30s
 		timeout server 30s
diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc b/reg-tests/http-rules/acl_cli_spaces.vtc
index 81b7b0dcf4..8e0d273ba2 100644
--- a/reg-tests/http-rules/acl_cli_spaces.vtc
+++ b/reg-tests/http-rules/acl_cli_spaces.vtc
@@ -7,7 +7,7 @@ server s1 {
    txresp
 } -repeat 2 -start
 
-haproxy h1 -W -S -conf {
+haproxy h1 -Ws -S -conf {
   defaults
     mode http
     timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
diff --git a/reg-tests/mcli/mcli_debug_dev.vtc b/reg-tests/mcli/mcli_debug_dev.vtc
index 147ff0dc7d..5fdf9c5ecd 100644
--- a/reg-tests/mcli/mcli_debug_dev.vtc
+++ b/reg-tests/mcli/mcli_debug_dev.vtc
@@ -19,7 +19,7 @@ syslog S1 -level info {
 } -start
 
 
-haproxy h1 -W -S -conf {
+haproxy h1 -Ws -S -conf {
     global
 	log ${S1_addr}:${S1_port} local0 info
 
diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc
index 276488a1b8..0a286580c5 100644
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -6,7 +6,7 @@ feature ignore_unknown_macro
 server s1 {
 } -start
 
-haproxy h1 -W -S -conf {
+haproxy h1 -Ws -S -conf {
     defaults
         mode http
         timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
diff --git a/reg-tests/mcli/mcli_start_progs.vtc b/reg-tests/mcli/mcli_start_progs.vtc
index 489efff7ee..51c70155b8 100644
--- a/reg-tests/mcli/mcli_start_progs.vtc
+++ b/reg-tests/mcli/mcli_start_progs.vtc
@@ -8,7 +8,7 @@ feature ignore_unknown_macro
 server s1 {
 } -start
 
-haproxy h1 -W -S -conf {
+haproxy h1 -Ws -S -conf {
     global
         expose-deprecated-directives
     defaults
diff --git a/reg-tests/seamless-reload/abns_socket.vtc b/reg-tests/seamless-reload/abns_socket.vtc
index 3686a1f65f..0e8a7f3d72 100644
--- a/reg-tests/seamless-reload/abns_socket.vtc
+++ b/reg-tests/seamless-reload/abns_socket.vtc
@@ -23,7 +23,7 @@ feature cmd "command -v grep"
 #EXCLUDE_TARGETS=freebsd,osx,generic
 #REGTEST_TYPE=devel
 
-haproxy h1 -W -S -conf {
+haproxy h1 -Ws -S -conf {
   global
     stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners
 
diff --git a/reg-tests/server/abnsz.vtc b/reg-tests/server/abnsz.vtc
index 164d17274c..f42933ed07 100644
--- a/reg-tests/server/abnsz.vtc
+++ b/reg-tests/server/abnsz.vtc
@@ -6,7 +6,7 @@ feature cmd "command -v curl"
 #EXCLUDE_TARGETS=freebsd,osx,generic
 #REGTEST_TYPE=devel
 
-haproxy h1 -W -S -conf {
+haproxy h1 -Ws -S -conf {
   global
     stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners