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.

diff --git a/reg-tests/connection/http_reuse_always.vtc b/reg-tests/connection/http_reuse_always.vtc
index 8931a03427eb66ff44a29a127c0d11bcbada6fdc..8f70367f8f48ad2bb91bd4a8b5217a4412d8a765 100644 (file)
--- 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 81b7b0dcf413ec817dceb92828949694676e2ccc..8e0d273ba2e06e2682510e41e2236deaf293069c 100644 (file)
--- 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 147ff0dc7ded983911ff1a57ec2a0d242b3ca67b..5fdf9c5ecd670eedeb2b5887869bc239e3bc38e5 100644 (file)
--- 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 276488a1b8b731de6c0c61c93ea210cdf16e80e1..0a286580c56e7f08d79529669e9d80acd33ece94 100644 (file)
--- 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 489efff7ee2ff072e659f81d294c7f66da83a410..51c70155b80c91ded65f6cc55e85778efb198544 100644 (file)
--- 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 3686a1f65f1d29f5b3075c49f7c6299a2a735342..0e8a7f3d7281feafa862a0441b307fd652fc7995 100644 (file)
--- 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 164d17274c697cc66d0fb73c4827999be444f078..f42933ed078605870096b372ed991103200fbad2 100644 (file)
--- 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