Commit bb1e3085 authored by Nils Goroll's avatar Nils Goroll

remove tests for error messages we do not get any more

parent 5a057fb5
...@@ -248,18 +248,18 @@ logexpect l2 -wait ...@@ -248,18 +248,18 @@ logexpect l2 -wait
varnish v2 -stop varnish v2 -stop
# hmac constructor fails if the key is NULL # # hmac constructor fails if the key is NULL
# broken in varnish-cache master # # broken in varnish-cache master - but phk does not accept
# ref: https://github.com/varnishcache/varnish-cache/pull/2941 # # ref: https://github.com/varnishcache/varnish-cache/pull/2941
varnish v1 -errvcl {vmod blobdigest error: key is NULL in fail constructor} { # varnish v1 -errvcl {vmod blobdigest error: key is NULL in fail constructor} {
import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"; # import blobdigest from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so";
import blob; # import blob;
backend b { .host = "${bad_ip}"; } # backend b { .host = "${bad_ip}"; }
#
sub vcl_init { # sub vcl_init {
new fail = blobdigest.hmac(MD5, blob.decode(decoding=HEX, encoded="x")); # new fail = blobdigest.hmac(MD5, blob.decode(decoding=HEX, encoded="x"));
} # }
} #}
# hmac method and hmacf function fail if msg or key is NULL # hmac method and hmacf function fail if msg or key is NULL
varnish v1 -vcl { varnish v1 -vcl {
...@@ -295,23 +295,25 @@ varnish v1 -vcl { ...@@ -295,23 +295,25 @@ varnish v1 -vcl {
} }
} }
logexpect l3 -v v1 -d 0 -g vxid -q {ReqURL ~ "^/1"} { # # broken in varnish-cache master - but phk does not accept
expect 0 * Begin req # # ref: https://github.com/varnishcache/varnish-cache/pull/2941
expect * = VCL_Error "^vmod blobdigest error: msg is NULL in h.hmac..$" #logexpect l3 -v v1 -d 0 -g vxid -q {ReqURL ~ "^/1"} {
expect * = End # expect 0 * Begin req
} -start # expect * = VCL_Error "^vmod blobdigest error: msg is NULL in h.hmac..$"
# expect * = End
logexpect l4 -v v1 -d 0 -g vxid -q {ReqURL ~ "^/2"} { #} -start
expect 0 * Begin req #
expect * = VCL_Error "^vmod blobdigest error: key is NULL in blobdigest.hmacf..$" #logexpect l4 -v v1 -d 0 -g vxid -q {ReqURL ~ "^/2"} {
expect * = End # expect 0 * Begin req
} -start # expect * = VCL_Error "^vmod blobdigest error: key is NULL in blobdigest.hmacf..$"
# expect * = End
logexpect l5 -v v1 -d 0 -g vxid -q {ReqURL ~ "^/3"} { #} -start
expect 0 * Begin req #
expect * = VCL_Error "^vmod blobdigest error: msg is NULL in blobdigest.hmacf..$" #logexpect l5 -v v1 -d 0 -g vxid -q {ReqURL ~ "^/3"} {
expect * = End # expect 0 * Begin req
} -start # expect * = VCL_Error "^vmod blobdigest error: msg is NULL in blobdigest.hmacf..$"
# expect * = End
#} -start
client c1 { client c1 {
txreq -url "/1" txreq -url "/1"
...@@ -334,6 +336,8 @@ client c3 { ...@@ -334,6 +336,8 @@ client c3 {
expect_close expect_close
} -run } -run
logexpect l3 -wait # # broken in varnish-cache master - but phk does not accept
logexpect l4 -wait # # ref: https://github.com/varnishcache/varnish-cache/pull/2941
logexpect l5 -wait #logexpect l3 -wait
#logexpect l4 -wait
#logexpect l5 -wait
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