Commit 6434572b authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

More badvcl->errvcl conversions.

Now only 100 more to go.
parent d65ee240
...@@ -92,7 +92,7 @@ client c1 { ...@@ -92,7 +92,7 @@ client c1 {
expect resp.bodylen == 22 expect resp.bodylen == 22
} -run } -run
varnish v1 -badvcl { varnish v1 -errvcl {'purge': not a valid action in method 'vcl_recv'.} {
backend s1 { .host = "${s1_addr}"; } backend s1 { .host = "${s1_addr}"; }
sub vcl_recv { if (req.http.purge == "yes") { purge; } } sub vcl_recv { if (req.http.purge == "yes") { purge; } }
} }
...@@ -15,14 +15,14 @@ varnish v1 -vcl+backend { ...@@ -15,14 +15,14 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set vcc_allow_inline_c false" varnish v1 -cliok "param.set vcc_allow_inline_c false"
varnish v1 -badvcl { varnish v1 -errvcl {Inline-C not allowed} {
backend default { backend default {
.host = "${s1_sock}"; .host = "${s1_sock}";
} }
C{ getpid(); }C C{ getpid(); }C
} }
varnish v1 -badvcl { varnish v1 -errvcl {Inline-C not allowed} {
backend default { backend default {
.host = "${s1_sock}"; .host = "${s1_sock}";
} }
......
...@@ -13,7 +13,7 @@ varnish v1 -vcl+backend { ...@@ -13,7 +13,7 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set vcc_unsafe_path off" varnish v1 -cliok "param.set vcc_unsafe_path off"
varnish v1 -badvcl { varnish v1 -errvcl {Include path is unsafe} {
backend default { backend default {
.host = "${s1_sock}"; .host = "${s1_sock}";
} }
......
...@@ -29,14 +29,14 @@ client c1 { ...@@ -29,14 +29,14 @@ client c1 {
expect resp.http.bar == "foo" expect resp.http.bar == "foo"
} -run } -run
varnish v1 -badvcl { varnish v1 -errvcl {Wrong enum value. Expected one of:} {
import debug from "${topbuild}/lib/libvmod_debug/.libs/libvmod_debug.so" ; import debug from "${topbuild}/lib/libvmod_debug/.libs/libvmod_debug.so" ;
sub vcl_deliver { sub vcl_deliver {
set resp.http.who = debug.author(jfk); set resp.http.who = debug.author(jfk);
} }
} }
varnish v1 -badvcl { varnish v1 -errvcl {Wrong argument type. Expected REAL. Got STRING.} {
import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ; import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
sub vcl_deliver { sub vcl_deliver {
set resp.http.who = std.random("foo", "bar"); set resp.http.who = std.random("foo", "bar");
......
...@@ -26,6 +26,6 @@ client c1 { ...@@ -26,6 +26,6 @@ client c1 {
expect resp.http.bar == "foo" expect resp.http.bar == "foo"
} -run } -run
varnish v1 -badvcl { varnish v1 -errvcl {Expected 'from path...'} {
import std to; import std to;
} }
...@@ -27,7 +27,7 @@ client c1 { ...@@ -27,7 +27,7 @@ client c1 {
expect resp.bodylen == 1 expect resp.bodylen == 1
} -run } -run
varnish v1 -badvcl { varnish v1 -errvcl {'beresp.http.bar': Not available in method 'vcl_recv'} {
import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ; import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
backend b { .host = "127.0.0.1"; } backend b { .host = "127.0.0.1"; }
......
...@@ -11,7 +11,7 @@ varnish v1 -vcl+backend { ...@@ -11,7 +11,7 @@ varnish v1 -vcl+backend {
varnish v1 -cliok "param.set vcc_unsafe_path off" varnish v1 -cliok "param.set vcc_unsafe_path off"
varnish v1 -badvcl { varnish v1 -errvcl {'import ... from path...' not allowed.} {
backend default { .host = "${s1_sock}"; } backend default { .host = "${s1_sock}"; }
import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ; import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
} }
......
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