mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

REGTESTS: switch to -Ws for master-worker reg-tests

Browse Source 
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.
This commit is contained in:
William Lallemand 2024-11-20 10:57:42 +01:00
parent 2ce0db4e4b
commit b7d81b3511
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reg-tests/connection/http_reuse_always.vtc
View File

@ -2,7 +2,7 @@ varnishtest "Test the http-reuse always mode"
feature ignore_unknown_macro feature ignore_unknown_macro
haproxy h1 -W -conf { haproxy h1 -Ws -conf {
defaults defaults
timeout client 30s timeout client 30s
timeout server 30s timeout server 30s

2
reg-tests/http-rules/acl_cli_spaces.vtc
View File

@ -7,7 +7,7 @@ server s1 {
txresp txresp
} -repeat 2 -start } -repeat 2 -start
haproxy h1 -W -S -conf { haproxy h1 -Ws -S -conf {
defaults defaults
mode http mode http
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

2
reg-tests/mcli/mcli_debug_dev.vtc
View File

@ -19,7 +19,7 @@ syslog S1 -level info {
} -start } -start
haproxy h1 -W -S -conf { haproxy h1 -Ws -S -conf {
global global
log ${S1_addr}:${S1_port} local0 info log ${S1_addr}:${S1_port} local0 info

2
reg-tests/mcli/mcli_show_info.vtc
View File

@ -6,7 +6,7 @@ feature ignore_unknown_macro
server s1 { server s1 {
} -start } -start
haproxy h1 -W -S -conf { haproxy h1 -Ws -S -conf {
defaults defaults
mode http mode http
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"

2
reg-tests/mcli/mcli_start_progs.vtc
View File

@ -8,7 +8,7 @@ feature ignore_unknown_macro
server s1 { server s1 {
} -start } -start
haproxy h1 -W -S -conf { haproxy h1 -Ws -S -conf {
global global
expose-deprecated-directives expose-deprecated-directives
defaults defaults

2
reg-tests/seamless-reload/abns_socket.vtc
View File

@ -23,7 +23,7 @@ feature cmd "command -v grep"
#EXCLUDE_TARGETS=freebsd,osx,generic #EXCLUDE_TARGETS=freebsd,osx,generic
#REGTEST_TYPE=devel #REGTEST_TYPE=devel
haproxy h1 -W -S -conf { haproxy h1 -Ws -S -conf {
global global
stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners

2
reg-tests/server/abnsz.vtc
View File

@ -6,7 +6,7 @@ feature cmd "command -v curl"
#EXCLUDE_TARGETS=freebsd,osx,generic #EXCLUDE_TARGETS=freebsd,osx,generic
#REGTEST_TYPE=devel #REGTEST_TYPE=devel
haproxy h1 -W -S -conf { haproxy h1 -Ws -S -conf {
global global
stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners stats socket "${tmpdir}/h1/stats" level admin expose-fd listeners