From fe5463ebf23aceda2c938c853b691fa79116be4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= Date: Tue, 21 Aug 2018 15:29:24 +0200 Subject: [PATCH] REGTEST/MINOR: Missing mandatory "ignore_unknown_macro". Since bbc34e2 varnish commit (for varnishtest), a new "cli" macro is automatically created for each VTC script to dialog with the CLI. Consequently, as this macro is unknown from higher level code for varnishtest, it makes the scripts fail if we we do not ask varnishtest to disregard the unknown macros. To prevent this, from now on, for each VTC file for haproxy we MUST add "feature ignore_unknown_macro" line to do so. This is mandatory --- doc/regression-testing.txt | 4 +++- reg-tests/spoe/h00000.vtc | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/regression-testing.txt b/doc/regression-testing.txt index 688459978..1b8cdb223 100644 --- a/doc/regression-testing.txt +++ b/doc/regression-testing.txt @@ -64,7 +64,9 @@ The VTC files for haproxy must also contain a "feature ignore_unknown_macro" lin if any macro is used for haproxy in this file. This is due to the fact that varnishtest parser code for haproxy commands generates macros the varnishtest parser code for varnish has no knowledge of. This line prevents varnishtest from -failing in such cases. +failing in such cases. Since bbc34e2 varnish commit, as a "cli" macro is +automatically generated, this "feature ignore_unknown_macro" is mandatory +for each VTC file for haproxy. To make varnishtest capable of testing haproxy, two new VTC commands have been implemented: "haproxy" and "syslog". "haproxy" is used to start haproxy processus. diff --git a/reg-tests/spoe/h00000.vtc b/reg-tests/spoe/h00000.vtc index b4ac87745..76b41d60b 100644 --- a/reg-tests/spoe/h00000.vtc +++ b/reg-tests/spoe/h00000.vtc @@ -7,6 +7,8 @@ varnishtest "SPOE bug: missing configuration file" +feature ignore_unknown_macro + haproxy h1 -conf-BAD {} { defaults timeout connect 5000ms