[7.0] 5e1589bf4 Use backend none more

Nils Goroll nils.goroll at uplex.de
Mon Nov 8 15:11:08 UTC 2021


commit 5e1589bf469be312e9af6ee98053936d55cfb7ce
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Oct 29 17:00:05 2021 +0200

    Use backend none more

diff --git a/bin/varnishtest/tests/v00016.vtc b/bin/varnishtest/tests/v00016.vtc
index 8a8dc1cf3..f1971efad 100644
--- a/bin/varnishtest/tests/v00016.vtc
+++ b/bin/varnishtest/tests/v00016.vtc
@@ -8,14 +8,14 @@ varnish v1 -vcl {
 }
 
 varnish v1 -errvcl {include <string> not followed by semicolon.} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	include "${tmpdir}/_varnishtest_empty_file" |
 }
 
 shell "rm -f ${tmpdir}/_varnishtest_empty_file"
 
 varnish v1 -errvcl {include not followed by string constant.} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	include <<
 }
 
@@ -29,18 +29,18 @@ varnish v1 -errvcl {include not followed by string constant.} {
 }
 
 varnish v1 -errvcl {Unknown duration unit 'k'} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	sub vcl_backend_response { set beresp.ttl = 1. k; }
 }
 
 varnish v1 -errvcl {Operator > not possible on BACKEND} {
-	backend a { .host = "${localhost}"; }
-	backend b { .host = "${localhost}"; }
+	backend a none;
+	backend b none;
 	sub vcl_recv { if (a > b) { } }
 }
 
 varnish v1 -errvcl {Unknown property 'foo' for type HTTP} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	sub vcl_hash { if (req.foo != "bar") { } }
 }
 
@@ -51,21 +51,21 @@ varnish v1 -errvcl {Symbol not found: 'foo.bar'} {
 }
 
 varnish v1 -errvcl {Cannot be set in subroutine 'vcl_pipe'} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	sub vcl_pipe {
 		set bereq.first_byte_timeout = 10s;
 	}
 }
 
 varnish v1 -errvcl {Cannot be set in subroutine 'vcl_pipe'.} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	sub vcl_pipe {
 		set bereq.between_bytes_timeout = 10s;
 	}
 }
 
 varnish v1 -errvcl {Undefined backend c, first reference:} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	sub vcl_backend_response {
 		if (beresp.backend == c) {
 			set beresp.ttl = 1h;
@@ -74,7 +74,7 @@ varnish v1 -errvcl {Undefined backend c, first reference:} {
 }
 
 varnish v1 -errvcl {Regexp compilation error:} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	sub vcl_recv {
 		if (req.url ~ "[a") {}
 	}
@@ -82,7 +82,7 @@ varnish v1 -errvcl {Regexp compilation error:} {
 
 varnish v1 -errvcl {Expression has type directors.shard, expected ACL} {
 	import directors;
-	backend b { .host = "${localhost}"; }
+	backend b none;
 
 	sub vcl_init {
 		new foo = directors.shard();
@@ -96,7 +96,7 @@ varnish v1 -errvcl {Expression has type directors.shard, expected ACL} {
 
 varnish v1 -syntax 4.0 -errvcl {Expression has type directors.shard, expected ACL} {
 	import directors;
-	backend b { .host = "${localhost}"; }
+	backend b none;
 
 	sub vcl_init {
 		new foo = directors.shard();
@@ -121,7 +121,7 @@ varnish v1 -errvcl {Undefined sub foo} {
 varnish v1 -syntax 4.0 -errvcl {Symbol not found: 'directors.foo'
 At:} {
 	import directors;
-	backend b { .host = "${localhost}"; }
+	backend b none;
 
 	sub vcl_init {
 		new foo = directors.foo();
@@ -130,7 +130,7 @@ At:} {
 
 # 'foo' overloaded
 varnish v1 -syntax 4.0 -errvcl {Symbol not found: 'foo'} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 
 	acl foo -pedantic {
 	    "${localhost}"/32;
diff --git a/bin/varnishtest/tests/v00022.vtc b/bin/varnishtest/tests/v00022.vtc
index fcb8014da..953882fd8 100644
--- a/bin/varnishtest/tests/v00022.vtc
+++ b/bin/varnishtest/tests/v00022.vtc
@@ -3,7 +3,7 @@ varnishtest "Various VCL compiler coverage tests - DNS dependent"
 feature dns
 
 varnish v1 -errvcl {resolves to too many addresses} {
-	backend b { .host = "${localhost}"; }
+	backend b none;
 	sub vcl_recv {
 		if (remote.ip == "dns-canary-multi.varnish-cache.org") {}
 	}


More information about the varnish-commit mailing list