[master] e2220de36 vtc: Make errors and successes stand out in b42

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Jan 5 22:37:09 UTC 2022


commit e2220de36d2e67d523a6b4cfc834756e7510dfee
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Jan 5 23:31:55 2022 +0100

    vtc: Make errors and successes stand out in b42
    
    A single tabulation after -cliok or -clierr XXX is enough to align
    everything.
    
    Better diff with the --ignore-all-space --word-diff options.

diff --git a/bin/varnishtest/tests/b00042.vtc b/bin/varnishtest/tests/b00042.vtc
index 02a969082..7f580ef24 100644
--- a/bin/varnishtest/tests/b00042.vtc
+++ b/bin/varnishtest/tests/b00042.vtc
@@ -1,44 +1,44 @@
 varnishtest "param edge cases"
 
-varnish v1 -vcl {backend foo {.host = "${localhost}";}} -start
+varnish v1 -vcl {backend be none;} -start
 
 
-varnish v1 -clierr "106" "param.set default_ttl -1"
-varnish v1 -clierr "106" "param.set acceptor_sleep_max 20"
-varnish v1 -clierr "200" "param.set prefer_ipv6 off"
-varnish v1 -clierr "200" "param.set prefer_ipv6 no"
-varnish v1 -clierr "200" "param.set prefer_ipv6 disable"
-varnish v1 -clierr "200" "param.set prefer_ipv6 false"
-varnish v1 -clierr "200" "param.set prefer_ipv6 on"
-varnish v1 -clierr "200" "param.set prefer_ipv6 yes"
-varnish v1 -clierr "200" "param.set prefer_ipv6 enable"
-varnish v1 -clierr "200" "param.set prefer_ipv6 true"
-varnish v1 -clierr "106" "param.set prefer_ipv6 foobar"
-varnish v1 -clierr "106" "param.set http_max_hdr 0"
-varnish v1 -clierr "106" "param.set http_max_hdr 1000000"
-varnish v1 -clierr "106" "param.set workspace_thread 1b"
-varnish v1 -clierr "106" "param.set workspace_thread 1m"
-varnish v1 -clierr "106" "param.set workspace_thread 1x"
-varnish v1 -clierr "106" "param.set workspace_thread x"
-varnish v1 -clierr "106" "param.set user ///"
-varnish v1 -clierr "106" "param.set user ///"
-varnish v1 -clierr "106" {param.set pool_sess "\""}
-varnish v1 -clierr "200" {param.set thread_pool_max 110}
-varnish v1 -clierr "106" {param.set thread_pool_min 111}
-varnish v1 -clierr "200" {param.set thread_pool_min 51}
-varnish v1 -clierr "106" {param.set thread_pool_max 50}
-varnish v1 -clierr "200" {param.set thread_pool_max 51}
-varnish v1 -clierr "200" {param.set thread_pool_max unlimited}
-varnish v1 -clierr "106" {param.show fofofofo}
-varnish v1 -cliok "param.show changed"
-varnish v1 -cliok "param.show "
-varnish v1 -cliok "param.show -l"
+varnish v1 -clierr 106	"param.set default_ttl -1"
+varnish v1 -clierr 106	"param.set acceptor_sleep_max 20"
+varnish v1 -cliok	"param.set prefer_ipv6 off"
+varnish v1 -cliok	"param.set prefer_ipv6 no"
+varnish v1 -cliok	"param.set prefer_ipv6 disable"
+varnish v1 -cliok	"param.set prefer_ipv6 false"
+varnish v1 -cliok	"param.set prefer_ipv6 on"
+varnish v1 -cliok	"param.set prefer_ipv6 yes"
+varnish v1 -cliok	"param.set prefer_ipv6 enable"
+varnish v1 -cliok	"param.set prefer_ipv6 true"
+varnish v1 -clierr 106	"param.set prefer_ipv6 foobar"
+varnish v1 -clierr 106	"param.set http_max_hdr 0"
+varnish v1 -clierr 106	"param.set http_max_hdr 1000000"
+varnish v1 -clierr 106	"param.set workspace_thread 1b"
+varnish v1 -clierr 106	"param.set workspace_thread 1m"
+varnish v1 -clierr 106	"param.set workspace_thread 1x"
+varnish v1 -clierr 106	"param.set workspace_thread x"
+varnish v1 -clierr 106	"param.set user ///"
+varnish v1 -clierr 106	"param.set user ///"
+varnish v1 -clierr 106	{param.set pool_sess "\""}
+varnish v1 -cliok	{param.set thread_pool_max 110}
+varnish v1 -clierr 106	{param.set thread_pool_min 111}
+varnish v1 -cliok	{param.set thread_pool_min 51}
+varnish v1 -clierr 106	{param.set thread_pool_max 50}
+varnish v1 -cliok	{param.set thread_pool_max 51}
+varnish v1 -cliok	{param.set thread_pool_max unlimited}
+varnish v1 -clierr 106	{param.show fofofofo}
+varnish v1 -cliok	"param.show changed"
+varnish v1 -cliok	"param.show "
+varnish v1 -cliok	"param.show -l"
 
-varnish v1 -clijson "param.show -j pool_req"
-varnish v1 -clijson "param.show -j pool_sess"
-varnish v1 -clijson "param.show -j changed"
-varnish v1 -clijson "param.show -j"
-varnish v1 -clierr "106" "param.show -j -l"
-varnish v1 -clierr "106" "param.show -j fofofofo"
-varnish v1 -clierr "105" "param.show debug debug"
-varnish v1 -clierr "105" "param.show -j debug debug"
+varnish v1 -clijson	"param.show -j pool_req"
+varnish v1 -clijson	"param.show -j pool_sess"
+varnish v1 -clijson	"param.show -j changed"
+varnish v1 -clijson	"param.show -j"
+varnish v1 -clierr 106	"param.show -j -l"
+varnish v1 -clierr 106	"param.show -j fofofofo"
+varnish v1 -clierr 105	"param.show debug debug"
+varnish v1 -clierr 105	"param.show -j debug debug"


More information about the varnish-commit mailing list