Mailing List Archive

commit 069b78a4b6653c3bbb16bf11798b658a149c92b5
Author: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon Aug 2 04:12:29 2021 +0000

HAProxy has subtly changed their --version message.

diff --git a/bin/varnishtest/tests/h00001.vtc b/bin/varnishtest/tests/h00001.vtc
index 7f8c11599..7d38c9b93 100644
--- a/bin/varnishtest/tests/h00001.vtc
+++ b/bin/varnishtest/tests/h00001.vtc
@@ -2,7 +2,7 @@ varnishtest "Basic HAproxy test"

feature ignore_unknown_macro

-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {haproxy --version 2>&1 | grep -q 'HA-*Proxy version'}

server s1 {
rxreq
diff --git a/bin/varnishtest/tests/h00002.vtc b/bin/varnishtest/tests/h00002.vtc
index c8c9bc1dd..bfa9fcc16 100644
--- a/bin/varnishtest/tests/h00002.vtc
+++ b/bin/varnishtest/tests/h00002.vtc
@@ -2,7 +2,7 @@ varnishtest "Basic HAproxy test (daemon mode)"

feature ignore_unknown_macro

-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {haproxy --version 2>&1 | grep -q 'HA-*Proxy version'}

server s1 {
rxreq
diff --git a/bin/varnishtest/tests/h00003.vtc b/bin/varnishtest/tests/h00003.vtc
index 404b1eecb..46d2e7b21 100644
--- a/bin/varnishtest/tests/h00003.vtc
+++ b/bin/varnishtest/tests/h00003.vtc
@@ -2,7 +2,7 @@ varnishtest "Test -conf+backend"

feature ignore_unknown_macro

-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {haproxy --version 2>&1 | grep -q 'HA-*Proxy version'}

server s1 {
rxreq
diff --git a/bin/varnishtest/tests/h00004.vtc b/bin/varnishtest/tests/h00004.vtc
index 122e0411d..754354f9b 100644
--- a/bin/varnishtest/tests/h00004.vtc
+++ b/bin/varnishtest/tests/h00004.vtc
@@ -2,7 +2,7 @@ varnishtest "Test -conf+backend"

feature ignore_unknown_macro

-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {haproxy --version 2>&1 | grep -q 'HA-*Proxy version'}

haproxy h1 -conf-OK {
defaults
diff --git a/bin/varnishtest/tests/h00005.vtc b/bin/varnishtest/tests/h00005.vtc
index 52f1d8315..e59234bd3 100644
--- a/bin/varnishtest/tests/h00005.vtc
+++ b/bin/varnishtest/tests/h00005.vtc
@@ -1,7 +1,7 @@
varnishtest "Exercise varnishtest syslog facility"

feature ignore_unknown_macro
-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {haproxy --version 2>&1 | grep -q 'HA-*Proxy version'}

server s1 {
rxreq
diff --git a/bin/varnishtest/tests/h00006.vtc b/bin/varnishtest/tests/h00006.vtc
index 18e099162..516dcd053 100644
--- a/bin/varnishtest/tests/h00006.vtc
+++ b/bin/varnishtest/tests/h00006.vtc
@@ -4,7 +4,7 @@ varnishtest "haproxy tcp-mode, uds, send-proxy-v2, client ip and acl"

feature ignore_unknown_macro

-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {haproxy --version 2>&1 | grep -q 'HA-*Proxy version'}

server s1 {
rxreq
diff --git a/bin/varnishtest/tests/h00007.vtc b/bin/varnishtest/tests/h00007.vtc
index b153590ba..9951ef7fc 100644
--- a/bin/varnishtest/tests/h00007.vtc
+++ b/bin/varnishtest/tests/h00007.vtc
@@ -4,7 +4,7 @@ varnishtest "haproxy tcp-mode, tcp, send-proxy-v2, client ip and acl"

feature ignore_unknown_macro

-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {haproxy --version 2>&1 | grep -q 'HA-*Proxy version'}

server s1 {
rxreq
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit