[6.0] 4086c5d60 Remove logexpect from the tests for VMOD blob out-of-workspace.

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Aug 16 08:53:19 UTC 2018


commit 4086c5d60b24891dbe33273446067eebcec47953
Author: Geoff Simmons <geoff at uplex.de>
Date:   Wed Jul 18 10:19:05 2018 +0200

    Remove logexpect from the tests for VMOD blob out-of-workspace.
    
    On the various platforms, esp 32-bit, workspace may be exhausted
    before it gets to the VMOD at all, so we can't reliably expect
    specific error messages.
    
    This has nevertheless improved GCOV coverage, which was the goal.

diff --git a/bin/varnishtest/tests/m00049.vtc b/bin/varnishtest/tests/m00049.vtc
index bca702cad..f94f5afc6 100644
--- a/bin/varnishtest/tests/m00049.vtc
+++ b/bin/varnishtest/tests/m00049.vtc
@@ -36,12 +36,6 @@ varnish v1 -vcl {
 	}
 } -start
 
-logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
-	expect 0 * Begin req
-	expect * = VCL_Error  {^vmod blob error: cannot decode, out of space$}
-	expect * = End
-} -start
-
 client c1 {
 	txreq -url "/1"
 	rxresp
@@ -49,14 +43,6 @@ client c1 {
 	expect resp.reason == "VCL failed"
 } -run
 
-logexpect l1 -wait
-
-logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
-	expect 0 * Begin req
-	expect * = VCL_Error  {^vmod blob error: cannot decode, out of space$}
-	expect * = End
-} -start
-
 client c1 {
 	txreq -url "/2"
 	rxresp
@@ -64,14 +50,6 @@ client c1 {
 	expect resp.reason == "VCL failed"
 } -run
 
-logexpect l1 -wait
-
-logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
-	expect 0 * Begin req
-	expect * = VCL_Error  {^vmod blob error: cannot encode, out of space$}
-	expect * = End
-} -start
-
 client c1 {
 	txreq -url "/3"
 	rxresp
@@ -79,19 +57,9 @@ client c1 {
 	expect resp.reason == "VCL failed"
 } -run
 
-logexpect l1 -wait
-
-logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
-	expect 0 * Begin req
-	expect * = VCL_Error  {^vmod blob error: cannot encode, out of space$}
-	expect * = End
-} -start
-
 client c1 {
 	txreq -url "/4"
 	rxresp
 	expect resp.status == 503
 	expect resp.reason == "VCL failed"
 } -run
-
-logexpect l1 -wait


More information about the varnish-commit mailing list