[6.0] 010a7ebc9 Oops, accidentally commited test-patch from #2760

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Oct 31 13:08:13 UTC 2018


commit 010a7ebc9b75fe0d0b84521e009bcec20ef47f66
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 4 08:04:11 2018 +0000

    Oops, accidentally commited test-patch from #2760

diff --git a/bin/varnishtest/tests/c00081.vtc b/bin/varnishtest/tests/c00081.vtc
index 419036cfe..b08fa3250 100644
--- a/bin/varnishtest/tests/c00081.vtc
+++ b/bin/varnishtest/tests/c00081.vtc
@@ -4,11 +4,7 @@ server s1 {
 	rxreq
 	txresp -hdr "foo: 1"
 	rxreq
-	txresp -hdr "foo: 2a"
-	rxreq
-	txresp -hdr "foo: 2b"
-	rxreq
-	txresp -hdr "foo: 2c"
+	txresp -hdr "foo: 2"
 	rxreq
 	txresp -hdr "foo: 3"
 } -start
@@ -33,31 +29,8 @@ varnish v1 -vcl+backend {
 
 } -start
 
-varnish v1 -cliok "param.set debug +refcnt"
-
 logexpect l1 -v v1 -g vxid {
-	expect * 1001	Debug		"^oh.*refcnt 1$"
-	expect 0 =	VCL_call	"^MISS"
-} -start
-
-logexpect l2 -v v1 -g vxid {
-	expect * 1003	Debug		"^oh.*refcnt 2$"
-	expect 0 =	HitPass	"^1002 1"
-} -start
-
-logexpect l3 -v v1 -g vxid {
-	expect * 1005	Debug		"^oh.*refcnt 2$"
-	expect 0 =	HitPass	"^1002 1"
-} -start
-
-logexpect l4 -v v1 -g vxid {
-	expect * 1007	Debug		"^oh.*refcnt 2$"
-	expect 0 =	HitPass	"^1002 1"
-} -start
-
-logexpect l5 -v v1 -g vxid {
-	expect * 1009	Debug		"^oh.*refcnt 1$"
-	expect 0 =	VCL_call	"^MISS"
+	expect * 1003	HitPass "^1002 1"
 } -start
 
 client c1 {
@@ -65,12 +38,6 @@ client c1 {
 	rxresp
 	expect resp.http.miss == True
 
-	txreq
-	rxresp
-	expect resp.http.pass == True
-	txreq
-	rxresp
-	expect resp.http.pass == True
 	txreq
 	rxresp
 	expect resp.http.pass == True
@@ -83,11 +50,7 @@ client c1 {
 } -run
 
 logexpect l1 -wait
-logexpect l2 -wait
-logexpect l3 -wait
-logexpect l4 -wait
-logexpect l5 -wait
 
-varnish v1 -expect MAIN.cache_hitpass == 3
+varnish v1 -expect MAIN.cache_hitpass == 1
 varnish v1 -expect MAIN.cache_miss == 2
 varnish v1 -expect MAIN.cache_hitmiss == 0


More information about the varnish-commit mailing list