Commit f488a1d9 authored by Geoff Simmons's avatar Geoff Simmons

Usa backend None in the VTC tests.

parent 0776ac8e
...@@ -4,10 +4,10 @@ varnishtest "vcl.use and .discard, and version strings" ...@@ -4,10 +4,10 @@ varnishtest "vcl.use and .discard, and version strings"
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
} -start } -start
varnish v1 -vcl {backend b { .host = "${bad_ip}"; }} varnish v1 -vcl {backend b None;}
varnish v1 -cli "vcl.list" varnish v1 -cli "vcl.list"
varnish v1 -cli "vcl.use vcl1" varnish v1 -cli "vcl.use vcl1"
...@@ -22,7 +22,7 @@ varnish v1 -cli "vcl.list" ...@@ -22,7 +22,7 @@ varnish v1 -cli "vcl.list"
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_recv { sub vcl_recv {
return(synth(200)); return(synth(200));
......
...@@ -7,7 +7,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/blob} ...@@ -7,7 +7,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/blob}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
import blob; import blob;
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/blob", ttl=0.1s); new rdr = file.reader("${tmpdir}/blob", ttl=0.1s);
......
...@@ -6,7 +6,7 @@ shell {touch ${tmpdir}/error} ...@@ -6,7 +6,7 @@ shell {touch ${tmpdir}/error}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/error", ttl=0.1s); new rdr = file.reader("${tmpdir}/error", ttl=0.1s);
......
...@@ -6,7 +6,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/file} ...@@ -6,7 +6,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/file}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/file"); new rdr = file.reader("${tmpdir}/file");
...@@ -33,7 +33,7 @@ shell {ln -s ${tmpdir}/file ${tmpdir}/link} ...@@ -33,7 +33,7 @@ shell {ln -s ${tmpdir}/file ${tmpdir}/link}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/link"); new rdr = file.reader("${tmpdir}/link");
...@@ -53,7 +53,7 @@ client c1 -run ...@@ -53,7 +53,7 @@ client c1 -run
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/file", ttl=0.1s, new rdr = file.reader("${tmpdir}/file", ttl=0.1s,
...@@ -131,7 +131,7 @@ shell {echo -n "The quick brown fox jumps over the lazy dog." > ${tmpdir}/fox} ...@@ -131,7 +131,7 @@ shell {echo -n "The quick brown fox jumps over the lazy dog." > ${tmpdir}/fox}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/fox", ttl=0s); new rdr = file.reader("${tmpdir}/fox", ttl=0s);
...@@ -169,7 +169,7 @@ client c1 { ...@@ -169,7 +169,7 @@ client c1 {
varnish v1 -errvcl {cannot open} { varnish v1 -errvcl {cannot open} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/nosuchfile"); new rdr = file.reader("${tmpdir}/nosuchfile");
...@@ -178,7 +178,7 @@ varnish v1 -errvcl {cannot open} { ...@@ -178,7 +178,7 @@ varnish v1 -errvcl {cannot open} {
varnish v1 -errvcl {not a regular file} { varnish v1 -errvcl {not a regular file} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}"); new rdr = file.reader("${tmpdir}");
...@@ -189,7 +189,7 @@ shell {ln -s ${tmpdir} ${tmpdir}/dirlink} ...@@ -189,7 +189,7 @@ shell {ln -s ${tmpdir} ${tmpdir}/dirlink}
varnish v1 -errvcl {not a regular file} { varnish v1 -errvcl {not a regular file} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/dirlink"); new rdr = file.reader("${tmpdir}/dirlink");
...@@ -198,7 +198,7 @@ varnish v1 -errvcl {not a regular file} { ...@@ -198,7 +198,7 @@ varnish v1 -errvcl {not a regular file} {
varnish v1 -errvcl {vmod file failure: new rdr: name is empty} { varnish v1 -errvcl {vmod file failure: new rdr: name is empty} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader(""); new rdr = file.reader("");
...@@ -207,7 +207,7 @@ varnish v1 -errvcl {vmod file failure: new rdr: name is empty} { ...@@ -207,7 +207,7 @@ varnish v1 -errvcl {vmod file failure: new rdr: name is empty} {
varnish v1 -errvcl {vmod file failure: new rdr: ttl -1.000 must be >= 0s} { varnish v1 -errvcl {vmod file failure: new rdr: ttl -1.000 must be >= 0s} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("foo", ttl=-1s); new rdr = file.reader("foo", ttl=-1s);
......
...@@ -6,7 +6,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/sz} ...@@ -6,7 +6,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/sz}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/sz", ttl=0.1s); new rdr = file.reader("${tmpdir}/sz", ttl=0.1s);
...@@ -81,7 +81,7 @@ shell {touch ${tmpdir}/mtime} ...@@ -81,7 +81,7 @@ shell {touch ${tmpdir}/mtime}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/mtime", ttl=0.1s); new rdr = file.reader("${tmpdir}/mtime", ttl=0.1s);
...@@ -115,7 +115,7 @@ shell {touch ${tmpdir}/nxtchk} ...@@ -115,7 +115,7 @@ shell {touch ${tmpdir}/nxtchk}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/nxtchk", ttl=0.1s); new rdr = file.reader("${tmpdir}/nxtchk", ttl=0.1s);
...@@ -150,7 +150,7 @@ shell {touch ${tmpdir}/deleteme} ...@@ -150,7 +150,7 @@ shell {touch ${tmpdir}/deleteme}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/deleteme", ttl=0.1s); new rdr = file.reader("${tmpdir}/deleteme", ttl=0.1s);
......
...@@ -11,7 +11,7 @@ shell { ...@@ -11,7 +11,7 @@ shell {
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new d1 = file.reader("pathtest", new d1 = file.reader("pathtest",
...@@ -41,7 +41,7 @@ client c1 { ...@@ -41,7 +41,7 @@ client c1 {
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new d1 = file.reader("pathtest", new d1 = file.reader("pathtest",
...@@ -68,7 +68,7 @@ shell {echo -n "2 only" > ${tmpdir}/d2/pathtest} ...@@ -68,7 +68,7 @@ shell {echo -n "2 only" > ${tmpdir}/d2/pathtest}
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new d1 = file.reader("pathtest", path="${tmpdir}/d1"); new d1 = file.reader("pathtest", path="${tmpdir}/d1");
...@@ -96,7 +96,7 @@ client c1 { ...@@ -96,7 +96,7 @@ client c1 {
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new tmp1 = file.reader("pathtest", path="${tmpdir}/d1:"); new tmp1 = file.reader("pathtest", path="${tmpdir}/d1:");
...@@ -129,7 +129,7 @@ shell { ...@@ -129,7 +129,7 @@ shell {
varnish v1 -errvcl {new rdr: unreadable not found or not readable on path} { varnish v1 -errvcl {new rdr: unreadable not found or not readable on path} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("unreadable", path="${tmpdir}"); new rdr = file.reader("unreadable", path="${tmpdir}");
...@@ -141,7 +141,7 @@ shell {rm -f ${tmpdir}/d2/pathtest} ...@@ -141,7 +141,7 @@ shell {rm -f ${tmpdir}/d2/pathtest}
varnish v1 -errvcl {new rdr: pathtest not found or not readable on path} { varnish v1 -errvcl {new rdr: pathtest not found or not readable on path} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("pathtest", new rdr = file.reader("pathtest",
...@@ -151,7 +151,7 @@ varnish v1 -errvcl {new rdr: pathtest not found or not readable on path} { ...@@ -151,7 +151,7 @@ varnish v1 -errvcl {new rdr: pathtest not found or not readable on path} {
varnish v1 -errvcl {new rdr: path is empty} { varnish v1 -errvcl {new rdr: path is empty} {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("pathtest", path=""); new rdr = file.reader("pathtest", path="");
......
...@@ -9,7 +9,7 @@ shell { ...@@ -9,7 +9,7 @@ shell {
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new synth = file.reader("${tmpdir}/synth", ttl=0.1s); new synth = file.reader("${tmpdir}/synth", ttl=0.1s);
...@@ -79,7 +79,7 @@ shell { ...@@ -79,7 +79,7 @@ shell {
varnish v1 -vcl { varnish v1 -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr = file.reader("${tmpdir}/synth"); new rdr = file.reader("${tmpdir}/synth");
......
...@@ -8,7 +8,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/file} ...@@ -8,7 +8,7 @@ shell {echo -n "foo bar baz quux" > ${tmpdir}/file}
# it possible to check the effects of temperature changes. # it possible to check the effects of temperature changes.
varnish v1 -arg "-p debug=+vclrel" -vcl { varnish v1 -arg "-p debug=+vclrel" -vcl {
import ${vmod_file}; import ${vmod_file};
backend b { .host = "${bad_ip}"; } backend b None;
sub vcl_init { sub vcl_init {
new rdr1 = file.reader("${tmpdir}/file", ttl=0.1s, new rdr1 = file.reader("${tmpdir}/file", ttl=0.1s,
...@@ -46,7 +46,7 @@ logexpect l1 -v v1 -d 1 -g raw -q "Debug" { ...@@ -46,7 +46,7 @@ logexpect l1 -v v1 -d 1 -g raw -q "Debug" {
expect * * Debug {^vmod file: vcl1\.rdr\d: check for \S+ finished successfully at} expect * * Debug {^vmod file: vcl1\.rdr\d: check for \S+ finished successfully at}
} -run } -run
varnish v1 -vcl { backend b { .host = "${bad_ip}"; } } varnish v1 -vcl { backend b None; }
varnish v1 -cliok "vcl.state vcl1 cold" varnish v1 -cliok "vcl.state vcl1 cold"
varnish v1 -cliok "vcl.list" varnish v1 -cliok "vcl.list"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment