[master] a0a3dfcff use backend None instead of bad_ip backend
Nils Goroll
nils.goroll at uplex.de
Wed Oct 9 11:04:05 UTC 2019
commit a0a3dfcff4390545c02475266a7ae75d9cebc251
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Wed Oct 9 12:52:40 2019 +0200
use backend None instead of bad_ip backend
... for those cases which can easily be changed (most of them).
This avoids issues with failing tests when bad_ip is actually reachable
via tcp on the respective port, as seen for example with b00068.vtc
diff --git a/bin/varnishtest/tests/b00053.vtc b/bin/varnishtest/tests/b00053.vtc
index adcec5974..e8cc9ab99 100644
--- a/bin/varnishtest/tests/b00053.vtc
+++ b/bin/varnishtest/tests/b00053.vtc
@@ -38,7 +38,7 @@ varnish v1 -expect s_resp_hdrbytes == 178
varnish v2 -arg "-a ${tmpdir}/v1.sock -b '${bad_backend}'" -start
varnish v2 -syntax 4.0 -errvcl {Compiled VCL version (4.0) not supported.} {
- backend default { .host = "${bad_ip}"; }
+ backend default None;
}
varnish v2 -syntax 4.0 -errvcl \
@@ -46,7 +46,7 @@ varnish v2 -syntax 4.0 -errvcl \
{backend default { .path = "${tmpdir}/v1.sock"; }}
varnish v3 -vcl {
- backend default { .host = "${bad_ip}"; }
+ backend default None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/b00068.vtc b/bin/varnishtest/tests/b00068.vtc
index e42b1a4e7..d5f6910b1 100644
--- a/bin/varnishtest/tests/b00068.vtc
+++ b/bin/varnishtest/tests/b00068.vtc
@@ -15,7 +15,7 @@ varnish v1 -arg "-p timeout_linger=1" \
import vtc;
import blob;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_recv {
std.log(blob.encode(encoding=HEX,
diff --git a/bin/varnishtest/tests/c00083.vtc b/bin/varnishtest/tests/c00083.vtc
index 6b5ff7e69..78fb14a53 100644
--- a/bin/varnishtest/tests/c00083.vtc
+++ b/bin/varnishtest/tests/c00083.vtc
@@ -1,7 +1,7 @@
varnishtest "Test VSM _.index rewrite when too many deletes"
varnish v1 -vcl {
- backend default { .host = "${bad_ip}"; }
+ backend default None;
} -start
delay 1
@@ -17,10 +17,10 @@ process p1 {
#process p3 {tail -F ${tmpdir}/v1/_.vsm_mgt/_.index} -dump -start
varnish v1 -vcl {
- backend b00 { .host = "${bad_ip}"; }
- backend b01 { .host = "${bad_ip}"; }
- backend b02 { .host = "${bad_ip}"; }
- backend b03 { .host = "${bad_ip}"; }
+ backend b00 None;
+ backend b01 None;
+ backend b02 None;
+ backend b03 None;
sub vcl_recv {
set req.backend_hint = b00;
@@ -46,26 +46,26 @@ process p1 -run
# cause a _.index rewrite.
# Make it 20 to be on the safe side.
varnish v1 -vcl {
- backend b00 { .host = "${bad_ip}"; }
- backend b01 { .host = "${bad_ip}"; }
- backend b02 { .host = "${bad_ip}"; }
- backend b03 { .host = "${bad_ip}"; }
- backend b04 { .host = "${bad_ip}"; }
- backend b05 { .host = "${bad_ip}"; }
- backend b06 { .host = "${bad_ip}"; }
- backend b07 { .host = "${bad_ip}"; }
- backend b08 { .host = "${bad_ip}"; }
- backend b09 { .host = "${bad_ip}"; }
- backend b10 { .host = "${bad_ip}"; }
- backend b11 { .host = "${bad_ip}"; }
- backend b12 { .host = "${bad_ip}"; }
- backend b13 { .host = "${bad_ip}"; }
- backend b14 { .host = "${bad_ip}"; }
- backend b15 { .host = "${bad_ip}"; }
- backend b16 { .host = "${bad_ip}"; }
- backend b17 { .host = "${bad_ip}"; }
- backend b18 { .host = "${bad_ip}"; }
- backend b19 { .host = "${bad_ip}"; }
+ backend b00 None;
+ backend b01 None;
+ backend b02 None;
+ backend b03 None;
+ backend b04 None;
+ backend b05 None;
+ backend b06 None;
+ backend b07 None;
+ backend b08 None;
+ backend b09 None;
+ backend b10 None;
+ backend b11 None;
+ backend b12 None;
+ backend b13 None;
+ backend b14 None;
+ backend b15 None;
+ backend b16 None;
+ backend b17 None;
+ backend b18 None;
+ backend b19 None;
sub vcl_recv {
set req.backend_hint = b00;
diff --git a/bin/varnishtest/tests/c00086.vtc b/bin/varnishtest/tests/c00086.vtc
index 0e6979ef3..0991ee23f 100644
--- a/bin/varnishtest/tests/c00086.vtc
+++ b/bin/varnishtest/tests/c00086.vtc
@@ -60,7 +60,7 @@ shell { chmod go-rx ${tmpdir}/dir }
varnish v8 \
-jail "-junix,user=varnish,ccgroup=varnish,workuser=vcache" \
- -vcl { backend b {.host="${bad_ip}";}
+ -vcl { backend b None;
}
varnish v8 -cliexpect "(?s)Cannot stat:.+That was just a warning" \
diff --git a/bin/varnishtest/tests/c00087.vtc b/bin/varnishtest/tests/c00087.vtc
index 443cea561..d84862860 100644
--- a/bin/varnishtest/tests/c00087.vtc
+++ b/bin/varnishtest/tests/c00087.vtc
@@ -69,7 +69,7 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_acl" {
} -run
varnish v1 -vcl {
- backend b { .host = "${bad_ip}"; }
+ backend b None;
acl acl1 {
"0.0.0.0";
@@ -97,7 +97,7 @@ client c1 -connect "${tmpdir}/v1.sock" {
} -run
varnish v1 -errvcl {.../mask is not numeric.} {
- backend b { .host = "${bad_ip}"; }
+ backend b None;
acl acl1 {
"${tmpdir}/v1.sock";
diff --git a/bin/varnishtest/tests/d00032.vtc b/bin/varnishtest/tests/d00032.vtc
index 5e307675c..52039132d 100644
--- a/bin/varnishtest/tests/d00032.vtc
+++ b/bin/varnishtest/tests/d00032.vtc
@@ -8,7 +8,7 @@ server s1 -listen "${tmpdir}/s1.sock" {
varnish v1 -vcl {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${s1_sock}");
@@ -19,7 +19,7 @@ varnish v1 -vcl {
}
} -start
-varnish v1 -expect MAIN.n_backend == 2
+varnish v1 -expect MAIN.n_backend == 1
client c1 {
txreq
@@ -30,7 +30,7 @@ client c1 {
varnish v1 -errvcl {path must be an absolute path} {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("");
@@ -40,7 +40,7 @@ varnish v1 -errvcl {path must be an absolute path} {
varnish v1 -errvcl {path must be an absolute path} {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("s1.sock");
@@ -52,7 +52,7 @@ shell { rm -f ${tmpdir}/foo }
varnish v1 -errvcl {Cannot stat path} {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${tmpdir}/foo");
@@ -62,7 +62,7 @@ varnish v1 -errvcl {Cannot stat path} {
varnish v1 -errvcl {is not a socket} {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${tmpdir}");
diff --git a/bin/varnishtest/tests/d00033.vtc b/bin/varnishtest/tests/d00033.vtc
index 1d837aba6..877005ea8 100644
--- a/bin/varnishtest/tests/d00033.vtc
+++ b/bin/varnishtest/tests/d00033.vtc
@@ -15,7 +15,7 @@ server s2 -listen "${tmpdir}/s2.sock" {
varnish v1 -vcl {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${s1_sock}");
@@ -30,7 +30,7 @@ varnish v1 -vcl {
}
} -start
-varnish v1 -expect MAIN.n_backend == 2
+varnish v1 -expect MAIN.n_backend == 1
client c1 {
txreq -url "/foo"
diff --git a/bin/varnishtest/tests/d00034.vtc b/bin/varnishtest/tests/d00034.vtc
index 314673fee..7e99eca11 100644
--- a/bin/varnishtest/tests/d00034.vtc
+++ b/bin/varnishtest/tests/d00034.vtc
@@ -21,7 +21,7 @@ server s2 -listen "${tmpdir}/s2.sock" {
varnish v1 -vcl {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${s1_sock}");
@@ -36,7 +36,7 @@ varnish v1 -vcl {
}
} -start
-varnish v1 -expect MAIN.n_backend == 2
+varnish v1 -expect MAIN.n_backend == 1
client c1 {
txreq -url "/foo"
diff --git a/bin/varnishtest/tests/d00035.vtc b/bin/varnishtest/tests/d00035.vtc
index e47c6703a..338dd5888 100644
--- a/bin/varnishtest/tests/d00035.vtc
+++ b/bin/varnishtest/tests/d00035.vtc
@@ -21,7 +21,7 @@ server s2 -listen "${tmpdir}/s2.sock" {
varnish v1 -vcl {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${s1_sock}");
@@ -37,7 +37,7 @@ varnish v1 -vcl {
}
} -start
-varnish v1 -expect MAIN.n_backend == 2
+varnish v1 -expect MAIN.n_backend == 1
client c1 {
txreq -url "/foo"
diff --git a/bin/varnishtest/tests/d00036.vtc b/bin/varnishtest/tests/d00036.vtc
index 3b739c755..b75278b44 100644
--- a/bin/varnishtest/tests/d00036.vtc
+++ b/bin/varnishtest/tests/d00036.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl {
import debug;
import vtc;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${s1_sock}");
@@ -40,7 +40,7 @@ varnish v1 -vcl {
}
} -start
-varnish v1 -expect MAIN.n_backend == 2
+varnish v1 -expect MAIN.n_backend == 1
client c1 {
txreq
diff --git a/bin/varnishtest/tests/d00037.vtc b/bin/varnishtest/tests/d00037.vtc
index 51c6e8f84..66c9b7258 100644
--- a/bin/varnishtest/tests/d00037.vtc
+++ b/bin/varnishtest/tests/d00037.vtc
@@ -14,7 +14,7 @@ server s1 -listen "${tmpdir}/s1.sock" {
varnish v1 -arg "-p thread_pools=1" -vcl {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${s1_sock}");
@@ -31,7 +31,7 @@ client c1 {
expect resp.status == 200
} -start
-varnish v1 -expect MAIN.n_backend == 2
+varnish v1 -expect MAIN.n_backend == 1
server s2 -listen "${tmpdir}/s2.sock" {
rxreq
@@ -44,7 +44,7 @@ barrier b1 sync
varnish v1 -vcl {
import debug;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s2 = debug.dyn_uds("${s2_sock}");
@@ -61,7 +61,7 @@ barrier b2 sync
client c1 -wait
delay 2
-varnish v1 -expect MAIN.n_backend == 4
+varnish v1 -expect MAIN.n_backend == 2
varnish v1 -expect n_vcl_avail == 1
varnish v1 -expect n_vcl_discard == 1
diff --git a/bin/varnishtest/tests/d00038.vtc b/bin/varnishtest/tests/d00038.vtc
index 1b8b70405..c3ce7cbb9 100644
--- a/bin/varnishtest/tests/d00038.vtc
+++ b/bin/varnishtest/tests/d00038.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl {
import debug;
import vtc;
- backend dummy { .host = "${bad_ip}"; }
+ backend dummy None;
sub vcl_init {
new s1 = debug.dyn_uds("${s1_sock}");
@@ -37,7 +37,7 @@ varnish v1 -vcl {
}
} -start
-varnish v1 -expect MAIN.n_backend == 2
+varnish v1 -expect MAIN.n_backend == 1
client c1 {
txreq
diff --git a/bin/varnishtest/tests/m00033.vtc b/bin/varnishtest/tests/m00033.vtc
index 64ab20850..fc5d4ddde 100644
--- a/bin/varnishtest/tests/m00033.vtc
+++ b/bin/varnishtest/tests/m00033.vtc
@@ -2,7 +2,7 @@ varnishtest "VMOD blob IDENTITY encode and decode"
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00034.vtc b/bin/varnishtest/tests/m00034.vtc
index 9d7144e0b..ef094124e 100644
--- a/bin/varnishtest/tests/m00034.vtc
+++ b/bin/varnishtest/tests/m00034.vtc
@@ -2,7 +2,7 @@ varnishtest "VMOD blob IDENTITY decode() n chars"
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00035.vtc b/bin/varnishtest/tests/m00035.vtc
index 9f7df333c..0af6184f0 100644
--- a/bin/varnishtest/tests/m00035.vtc
+++ b/bin/varnishtest/tests/m00035.vtc
@@ -4,7 +4,7 @@ varnishtest "VMOD blob hex encode and decode"
varnish v1 -arg "-p workspace_client=256k" -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00036.vtc b/bin/varnishtest/tests/m00036.vtc
index 12e1c24cc..ee3ea5246 100644
--- a/bin/varnishtest/tests/m00036.vtc
+++ b/bin/varnishtest/tests/m00036.vtc
@@ -3,7 +3,7 @@ varnishtest "VMOD blob hex decode() n chars"
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00037.vtc b/bin/varnishtest/tests/m00037.vtc
index e545f1c92..3d463ec0e 100644
--- a/bin/varnishtest/tests/m00037.vtc
+++ b/bin/varnishtest/tests/m00037.vtc
@@ -2,7 +2,7 @@ varnishtest "VMOD blob base64 encode and decode"
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
@@ -126,7 +126,7 @@ client c1 {
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00038.vtc b/bin/varnishtest/tests/m00038.vtc
index a5859817d..31a729ea9 100644
--- a/bin/varnishtest/tests/m00038.vtc
+++ b/bin/varnishtest/tests/m00038.vtc
@@ -2,7 +2,7 @@ varnishtest "VMOD blob base64 decode() n chars"
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00039.vtc b/bin/varnishtest/tests/m00039.vtc
index bfcd67ead..413152b6f 100644
--- a/bin/varnishtest/tests/m00039.vtc
+++ b/bin/varnishtest/tests/m00039.vtc
@@ -3,7 +3,7 @@ varnishtest "VMOD blob url encode and decode"
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
@@ -143,7 +143,7 @@ client c1 {
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00040.vtc b/bin/varnishtest/tests/m00040.vtc
index 2177f8a73..35e4c18a1 100644
--- a/bin/varnishtest/tests/m00040.vtc
+++ b/bin/varnishtest/tests/m00040.vtc
@@ -3,7 +3,7 @@ varnishtest "VMOD blob decode() n chars with URL"
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00041.vtc b/bin/varnishtest/tests/m00041.vtc
index aeda981f9..15e2e3c72 100644
--- a/bin/varnishtest/tests/m00041.vtc
+++ b/bin/varnishtest/tests/m00041.vtc
@@ -4,7 +4,7 @@ varnishtest "VMOD blob test transcode()"
varnish v1 -arg "-p workspace_client=256k" -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
@@ -129,7 +129,7 @@ client c1 {
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
@@ -274,7 +274,7 @@ client c1 {
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00042.vtc b/bin/varnishtest/tests/m00042.vtc
index 6e6004f63..a03e46a3d 100644
--- a/bin/varnishtest/tests/m00042.vtc
+++ b/bin/varnishtest/tests/m00042.vtc
@@ -3,7 +3,7 @@ varnishtest "VMOD blob test transcode() n chars"
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
@@ -134,7 +134,7 @@ client c1 {
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
@@ -270,7 +270,7 @@ client c1 {
varnish v1 -vcl {
import blob;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return(synth(200));
diff --git a/bin/varnishtest/tests/m00043.vtc b/bin/varnishtest/tests/m00043.vtc
index 9062314ef..e58cfbdc3 100644
--- a/bin/varnishtest/tests/m00043.vtc
+++ b/bin/varnishtest/tests/m00043.vtc
@@ -2,7 +2,7 @@ varnishtest "VMOD blob blob object interface"
varnish v1 -arg "-i serverid" -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new id = blob.blob(IDENTITY,
@@ -94,7 +94,7 @@ client c1 -run
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new idempty = blob.blob(IDENTITY, "");
@@ -167,7 +167,7 @@ client c1 -run
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new b64 = blob.blob(BASE64, "L0hlbGxvIHdvcmxkLw==");
@@ -257,7 +257,7 @@ client c2 -run
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new id = blob.blob(IDENTITY,
@@ -455,7 +455,7 @@ logexpect l1 -wait
varnish v1 -errvcl {vmod blob error: cannot create blob err, illegal encoding beginning with "g"} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new err = blob.blob(HEX, "g");
}
@@ -463,7 +463,7 @@ varnish v1 -errvcl {vmod blob error: cannot create blob err, illegal encoding be
varnish v1 -errvcl {vmod blob error: cannot create blob bad64, illegal encoding beginning with "-_-_"} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new bad64 = blob.blob(BASE64, "-_-_");
}
@@ -471,7 +471,7 @@ varnish v1 -errvcl {vmod blob error: cannot create blob bad64, illegal encoding
varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding beginning with "+/+/"} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new badurl = blob.blob(BASE64URL, "+/+/");
}
@@ -479,7 +479,7 @@ varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding
varnish v1 -errvcl {vmod blob error: cannot create blob badpad, illegal encoding beginning with "YWI="} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new badpad = blob.blob(BASE64URLNOPAD, "YWI=");
}
@@ -487,7 +487,7 @@ varnish v1 -errvcl {vmod blob error: cannot create blob badpad, illegal encoding
varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding beginning with "%"} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new badurl = blob.blob(URL, "%");
}
@@ -495,7 +495,7 @@ varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding
varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding beginning with "%2"} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new badurl = blob.blob(URL, "%2");
}
@@ -503,7 +503,7 @@ varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding
varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding beginning with "%q"} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new badurl = blob.blob(URL, "%q");
}
@@ -511,7 +511,7 @@ varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding
varnish v1 -errvcl {vmod blob error: cannot create blob badurl, illegal encoding beginning with "%2q"} {
import blob;
- backend b { .host="${bad_ip}"; }
+ backend b None;
sub vcl_init {
new badurl = blob.blob(URL, "%2q");
}
diff --git a/bin/varnishtest/tests/m00045.vtc b/bin/varnishtest/tests/m00045.vtc
index 010671179..1bf37fd94 100644
--- a/bin/varnishtest/tests/m00045.vtc
+++ b/bin/varnishtest/tests/m00045.vtc
@@ -2,7 +2,7 @@ varnishtest "VMOD blob same(), equal(), length() and sub()"
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new foo1 = blob.blob(IDENTITY, "foobarbazquux");
@@ -168,7 +168,7 @@ client c1 {
# sub()
varnish v1 -vcl {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
# Byte values 0 up to 7
@@ -291,7 +291,7 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
# VCL load failures from sub()
varnish v1 -errvcl {vmod blob error: blob is empty in blob.sub()} {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new empty = blob.blob(IDENTITY, "");
@@ -303,7 +303,7 @@ varnish v1 -errvcl {vmod blob error: blob is empty in blob.sub()} {
varnish v1 -errvcl {vmod blob error: size 9 from offset 0 requires more bytes than blob length 8 in blob.sub()} {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new up07 = blob.blob(BASE64, "AAECAwQFBgc=");
@@ -315,7 +315,7 @@ varnish v1 -errvcl {vmod blob error: size 9 from offset 0 requires more bytes th
varnish v1 -errvcl {vmod blob error: size 4 from offset 5 requires more bytes than blob length 8 in blob.sub()} {
import blob;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new up07 = blob.blob(BASE64, "AAECAwQFBgc=");
diff --git a/bin/varnishtest/tests/m00046.vtc b/bin/varnishtest/tests/m00046.vtc
index dca4fba25..8d2e2fd61 100644
--- a/bin/varnishtest/tests/m00046.vtc
+++ b/bin/varnishtest/tests/m00046.vtc
@@ -4,7 +4,7 @@ varnish v1 -arg "-a ${tmpdir}/v1.sock -b '${bad_backend}'" -start
varnish v2 -arg "-a ${tmpdir}/v2.sock" -vcl {
import std;
- backend default { .host = "${bad_ip}"; }
+ backend default None;
sub vcl_recv {
return(synth(200));
@@ -31,7 +31,7 @@ varnish v2 -errvcl {Cannot convert to an IP address: '"${v1_addr}"'} {
varnish v2 -vcl {
import std;
- backend default { .host = "${bad_ip}"; }
+ backend default None;
sub vcl_recv {
# Silently ignored for a UDS
diff --git a/bin/varnishtest/tests/m00047.vtc b/bin/varnishtest/tests/m00047.vtc
index 3eb3857b4..e9c05b032 100644
--- a/bin/varnishtest/tests/m00047.vtc
+++ b/bin/varnishtest/tests/m00047.vtc
@@ -61,7 +61,7 @@ logexpect l1 -v v1 -d 1 -c {
varnish v1 -errvcl {vmod unix failure: may not be called in vcl_init or vcl_fini} {
import unix;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
std.log(unix.uid());
@@ -71,7 +71,7 @@ varnish v1 -errvcl {vmod unix failure: may not be called in vcl_init or vcl_fini
varnish v1 -errvcl {vmod unix failure: may not be called in vcl_init or vcl_fini} {
import unix;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
std.log(unix.gid());
@@ -81,7 +81,7 @@ varnish v1 -errvcl {vmod unix failure: may not be called in vcl_init or vcl_fini
varnish v1 -errvcl {vmod unix failure: may not be called in vcl_init or vcl_fini} {
import unix;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
std.log(unix.user());
@@ -91,7 +91,7 @@ varnish v1 -errvcl {vmod unix failure: may not be called in vcl_init or vcl_fini
varnish v1 -errvcl {vmod unix failure: may not be called in vcl_init or vcl_fini} {
import unix;
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
std.log(unix.group());
diff --git a/bin/varnishtest/tests/m00049.vtc b/bin/varnishtest/tests/m00049.vtc
index 17ea49e84..b92968dea 100644
--- a/bin/varnishtest/tests/m00049.vtc
+++ b/bin/varnishtest/tests/m00049.vtc
@@ -3,7 +3,7 @@ varnishtest "VMOD blob workspace overflow conditions"
varnish v1 -vcl {
import blob;
import vtc;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
if (req.url == "/1") {
@@ -72,7 +72,7 @@ client c4 {
varnish v1 -vcl {
import blob;
import vtc;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
if (req.url == "/1") {
@@ -104,7 +104,7 @@ client c3 -run
varnish v1 -vcl {
import blob;
import vtc;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
if (req.url == "/1") {
@@ -135,7 +135,7 @@ client c3 -run
varnish v1 -vcl {
import blob;
import vtc;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
if (req.url == "/1") {
@@ -166,7 +166,7 @@ client c3 -run
varnish v1 -vcl {
import blob;
import vtc;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_miss {
if (req.url == "/1") {
diff --git a/bin/varnishtest/tests/m00050.vtc b/bin/varnishtest/tests/m00050.vtc
index a6578a6bd..c7192be4f 100644
--- a/bin/varnishtest/tests/m00050.vtc
+++ b/bin/varnishtest/tests/m00050.vtc
@@ -2,7 +2,7 @@ varnishtest "std.fnmatch()"
varnish v1 -vcl {
import std;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
return (synth(200));
diff --git a/bin/varnishtest/tests/r02418.vtc b/bin/varnishtest/tests/r02418.vtc
index a03ca546c..01e8feee0 100644
--- a/bin/varnishtest/tests/r02418.vtc
+++ b/bin/varnishtest/tests/r02418.vtc
@@ -15,7 +15,7 @@ varnish v1 -cliok "param.set feature +http2"
varnish v1 -cliok "param.set feature +no_coredump"
varnish v1 -vcl {
- backend b1 { .host = "${bad_ip}"; }
+ backend b1 None;
sub vcl_recv {
return (synth(200));
}
diff --git a/bin/varnishtest/tests/r02880.vtc b/bin/varnishtest/tests/r02880.vtc
index 1d554230b..9a33ac6b8 100644
--- a/bin/varnishtest/tests/r02880.vtc
+++ b/bin/varnishtest/tests/r02880.vtc
@@ -2,7 +2,7 @@ varnishtest "Long VMOD object names"
varnish v1 -vcl {
import debug;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
new l234567890123456789012345678901234567890123456789012345678
diff --git a/bin/varnishtest/tests/v00038.vtc b/bin/varnishtest/tests/v00038.vtc
index d408896b8..6662eefb5 100644
--- a/bin/varnishtest/tests/v00038.vtc
+++ b/bin/varnishtest/tests/v00038.vtc
@@ -132,7 +132,7 @@ varnish v1 -errvcl "Not a socket:" {
# VCC warns, but does not fail, if stat(UDS) fails with ENOENT.
shell { rm -f ${tmpdir}/foo }
-varnish v1 -vcl { backend b {.host="${bad_ip}";} }
+varnish v1 -vcl { backend b None; }
varnish v1 -cliexpect "(?s)Cannot stat:.+That was just a warning" \
{vcl.inline test "vcl 4.1; backend b {.path=\"${tmpdir}/foo\";}"}
diff --git a/bin/varnishtest/tests/v00054.vtc b/bin/varnishtest/tests/v00054.vtc
index c92e8cce6..f298c4fb1 100644
--- a/bin/varnishtest/tests/v00054.vtc
+++ b/bin/varnishtest/tests/v00054.vtc
@@ -35,7 +35,7 @@ client c1 -connect "${tmpdir}/v2.sock" {
} -run
varnish v3 -arg "-a ${tmpdir}/v3.sock" -vcl {
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_recv {
if (req.url == "/nobody") {
diff --git a/bin/varnishtest/tests/v00058.vtc b/bin/varnishtest/tests/v00058.vtc
index dda187f6d..2aa5ee2b2 100644
--- a/bin/varnishtest/tests/v00058.vtc
+++ b/bin/varnishtest/tests/v00058.vtc
@@ -2,7 +2,7 @@ varnishtest "Test VRT STRANDS functions"
varnish v1 -arg "-i foobar" -vcl {
import debug;
- backend b { .host = "${bad_ip}"; }
+ backend b None;
sub vcl_init {
# tests VRT_Strands()
More information about the varnish-commit
mailing list