[master] 594c737d7 Test even more obscure corners of varnishhist

Poul-Henning Kamp phk at FreeBSD.org
Sun Sep 9 18:33:08 UTC 2018


commit 594c737d7e0629b1691f2c2c33b02501247e7214
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Sep 9 18:31:44 2018 +0000

    Test even more obscure corners of varnishhist

diff --git a/bin/varnishtest/tests/u00007.vtc b/bin/varnishtest/tests/u00007.vtc
index fb3a81a26..161643130 100644
--- a/bin/varnishtest/tests/u00007.vtc
+++ b/bin/varnishtest/tests/u00007.vtc
@@ -37,3 +37,7 @@ shell -err -expect "-P: 'b:BereqAcct:x' is not a valid profile name or definitio
 	"varnishhist -P b:BereqAcct:x"
 shell -err -expect "-P: 'b:BereqAcct:x' is not a valid profile name or definition" \
 	"varnishhist -P b:BereqAcct:x:"
+shell -err -expect "-P: 'b:BereqAcct:' is not a valid profile name or definition" \
+	"varnishhist -P b:BereqAcct::5:1:a"
+shell -err -expect "-p: invalid '0'" \
+	"varnishhist -P b:BereqAcct::5 -p 0"
diff --git a/bin/varnishtest/tests/u00009.vtc b/bin/varnishtest/tests/u00009.vtc
index df3551cef..3f62e34ab 100644
--- a/bin/varnishtest/tests/u00009.vtc
+++ b/bin/varnishtest/tests/u00009.vtc
@@ -2,17 +2,17 @@ varnishtest	"trivial run of varnishhist in curses mode"
 
 server s1 {
 	rxreq
-	txresp
+	txresp -bodylen 32
 } -start
 
 varnish v1 -vcl+backend {} -start
 
 process p1 -dump {varnishhist -n ${v1_name}} -start
-process p2 -dump {varnishhist -n ${v1_name} -P b:BereqAcct::5:1:8} -start
+process p2 -dump {varnishhist -n ${v1_name} -P b:BereqAcct::5:-1:1} -start
 process p3 -dump {varnishhist -n ${v1_name} -P BerespBodytime -B 2} -start
 
 process p1 -expect-text 24 0 {1e2}
-process p2 -expect-text 24 0 {1e2}
+process p2 -expect-text 24 0 {1e-1}
 process p3 -expect-text 24 0 {1e2}
 
 delay 1
@@ -22,13 +22,18 @@ client c1 {
 	rxresp
 } -run
 
+varnish v1 -vsl_catchup
+
 process p1 -expect-text 22 0 {#}
+process p2 -expect-text 22 80 {#}
 
 client c1 {
 	txreq
 	rxresp
 } -run
 
+varnish v1 -vsl_catchup
+
 process p1 -expect-text 22 0 { | }
 
 process p1 -expect-text 3 1 {20_}
@@ -39,12 +44,12 @@ process p1 -winsz 23 80 -need-bytes +10
 
 process p1 -write {0>+-<} -need-bytes +10
 
-process p3 -write {0>+-<x} -need-bytes +10
+process p3 -write {0++++++++++>+-<x} -need-bytes +10
 
 process p1 -expect-text 2 1 {20_}
 
 process p1 -writehex 0c -need-bytes +10
 
 process p1 -screen_dump -write {q} -wait
-process p2 -screen_dump -write {q} -wait
+process p2 -screen_dump -kill HUP -wait
 process p3 -screen_dump -write {q} -wait


More information about the varnish-commit mailing list