[master] 6bb9bcec1 Test more of varnishtop

[Poul-Henning Kamp]

commit 6bb9bcec1ad7d1d96df0e4eae0ea77384703b621
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 4 08:05:30 2018 +0000

    Test more of varnishtop

diff --git a/bin/varnishtest/tests/u00004.vtc b/bin/varnishtest/tests/u00004.vtc
index 5dfaa3310..9d2be8ed4 100644
--- a/bin/varnishtest/tests/u00004.vtc
+++ b/bin/varnishtest/tests/u00004.vtc
@@ -31,7 +31,12 @@ shell -match "1\\.00 RespHeader Date\\n" {
 
 shell -match "Usage: .*varnishtop <options>" \
 	"varnishtop -h"
+
 shell -expect "Copyright (c) 2006 Verdens Gang AS" \
 	"varnishtop -V"
+
 shell -err -match "Usage: .*varnishtop <options>" \
 	"varnishtop extra"
+
+shell -err -match "is not a number" \
+	"varnishtop -p ABC"
diff --git a/bin/varnishtest/tests/u00010.vtc b/bin/varnishtest/tests/u00010.vtc
index 5eee23ab3..dd37a15d0 100644
--- a/bin/varnishtest/tests/u00010.vtc
+++ b/bin/varnishtest/tests/u00010.vtc
@@ -9,8 +9,6 @@ varnish v1 -vcl+backend {} -start
 
 process p1 -dump {varnishtop -n ${v1_name}} -start
 
-process p1 -winsz 30 80
-
 process p1 -expect-text 1 1 {list length}
 
 delay 1
@@ -20,5 +18,20 @@ client c1 {
 	rxresp
 } -run
 
-process p1 -expect-text 0 0 {Fetch_Body}
+varnish v1 -vsl_catchup
+
+process p1 -expect-text 1 1 {list length 64}
+
+process p1 -writehex 0c
+
+process p1 -need-bytes +1
+
+process p1 -writehex 0b
+
+process p1 -need-bytes +1
+
+process p1 -winsz 30 80
+
+process p1 -need-bytes +1
+
 process p1 -screen_dump -write {q} -wait