[master] fc90bf0 This test didn't actually use persistent storage because the "shortlived" test puts the object in Transient.

Poul-Henning Kamp phk at FreeBSD.org
Tue Dec 17 10:50:05 CET 2013


commit fc90bf08720af47673d334053270a69c72e94718
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Dec 17 09:49:21 2013 +0000

    This test didn't actually use persistent storage because the
    "shortlived" test puts the object in Transient.
    
    Patch by:	gquintard
    Fixes		#1387

diff --git a/bin/varnishtest/tests/p00005.vtc b/bin/varnishtest/tests/p00005.vtc
index dc95677..1ac8e08 100644
--- a/bin/varnishtest/tests/p00005.vtc
+++ b/bin/varnishtest/tests/p00005.vtc
@@ -10,15 +10,22 @@ server s1 {
 varnish v1 \
 	-arg "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0" \
+	-arg "-pshortlived=0" \
 	-vcl+backend {
 		sub vcl_backend_response {
 			set beresp.ttl = 3s;
+			set beresp.keep = 0s;
+			set beresp.grace = 0s;
 		}
 	} -start
 
 varnish v1 -cliok "param.set debug +syncvsl"
 varnish v1 -cliok "param.set feature +wait_silo"
 
+logexpect l1 -v v1 -g vxid -q "Begin ~ bereq" {
+    expect * 1002 Storage         "persistent s0"
+} -start
+
 client c1 {
 	txreq -url "/foo"
 	rxresp
@@ -27,6 +34,7 @@ client c1 {
 	expect resp.http.foo == "foo1"
 } -run
 
+logexpect l1 -wait
 varnish v1 -expect n_object == 1
 
 varnish v1 -stop
@@ -44,6 +52,10 @@ varnish v1 -vcl+backend {
 
 delay 5
 
+logexpect l1 -v v1 -g vxid -q "Begin ~ bereq" {
+    expect * 1002 Storage         "persistent s0"
+} -start
+
 client c1 {
 	txreq -url "/foo"
 	rxresp
@@ -52,4 +64,5 @@ client c1 {
 	expect resp.http.foo == "foo2"
 } -run
 
+logexpect l1 -wait
 varnish v1 -expect n_object == 1



More information about the varnish-commit mailing list