Skip to content

Commit b7d81b3

Browse files
committed
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.
1 parent 2ce0db4 commit b7d81b3

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

reg-tests/connection/http_reuse_always.vtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ varnishtest "Test the http-reuse always mode"
22

33
feature ignore_unknown_macro
44

5-
haproxy h1 -W -conf {
5+
haproxy h1 -Ws -conf {
66
defaults
77
timeout client 30s
88
timeout server 30s

reg-tests/http-rules/acl_cli_spaces.vtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ server s1 {
77
txresp
88
} -repeat 2 -start
99

10-
haproxy h1 -W -S -conf {
10+
haproxy h1 -Ws -S -conf {
1111
defaults
1212
mode http
1313
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/mcli/mcli_debug_dev.vtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ syslog S1 -level info {
1919
} -start
2020

2121

22-
haproxy h1 -W -S -conf {
22+
haproxy h1 -Ws -S -conf {
2323
global
2424
log ${S1_addr}:${S1_port} local0 info
2525

reg-tests/mcli/mcli_show_info.vtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ feature ignore_unknown_macro
66
server s1 {
77
} -start
88

9-
haproxy h1 -W -S -conf {
9+
haproxy h1 -Ws -S -conf {
1010
defaults
1111
mode http
1212
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

reg-tests/mcli/mcli_start_progs.vtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ feature ignore_unknown_macro
88
server s1 {
99
} -start
1010

11-
haproxy h1 -W -S -conf {
11+
haproxy h1 -Ws -S -conf {
1212
global
1313
expose-deprecated-directives
1414
defaults

reg-tests/seamless-reload/abns_socket.vtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ feature cmd "command -v grep"
2323
#EXCLUDE_TARGETS=freebsd,osx,generic
2424
#REGTEST_TYPE=devel
2525

26-
haproxy h1 -W -S -conf {
26+
haproxy h1 -Ws -S -conf {
2727
global
2828
stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners
2929

reg-tests/server/abnsz.vtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ feature cmd "command -v curl"
66
#EXCLUDE_TARGETS=freebsd,osx,generic
77
#REGTEST_TYPE=devel
88

9-
haproxy h1 -W -S -conf {
9+
haproxy h1 -Ws -S -conf {
1010
global
1111
stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners
1212

0 commit comments

Comments
 (0)