[master] 87a1a0d Merge tests and add more coverage

[Federico G. Schwindt]

commit 87a1a0d7e6cd9dd8a8985c7c16298e2096c4046c
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Jan 20 11:59:20 2017 +0000

    Merge tests and add more coverage
    
    My aim is to have one u* vtc per tool.

diff --git a/bin/varnishtest/tests/u00002.vtc b/bin/varnishtest/tests/u00002.vtc
deleted file mode 100644
index 67b7c81..0000000
--- a/bin/varnishtest/tests/u00002.vtc
+++ /dev/null
@@ -1,31 +0,0 @@
-varnishtest "Test varnishstat -f option"
-
-server s1 {
-	rxreq
-	txresp
-} -start
-
-varnish v1 -vcl+backend {} -start
-
-# On fast systems the next varnishstat will return "inf" counters
-# if we don't give varnishd a chance to get going.
-
-delay 1
-
-process p1 {varnishstat -1 -n ${v1_name} -f ^LCK.vbe.destroy \
-	-f LCK.vbe.* -f LCK.mempool.* | tr '[1-9]' '0'} -run
-
-shell "grep -q vbe ${tmpdir}/p1/stdout"
-shell "grep -q mempool ${tmpdir}/p1/stdout"
-shell -err "grep -q LCK.vbe.destroy ${tmpdir}/p1/stdout"
-
-process p2 {varnishstat -1 -n ${v1_name} -f ^*vbe.destroy \
-	-f *vbe* -f *mempool* | tr '[1-9]' '0'} -run
-
-shell "grep -q vbe ${tmpdir}/p2/stdout"
-shell "grep -q mempool ${tmpdir}/p2/stdout"
-shell -err "grep -q LCK.vbe.destroy ${tmpdir}/p2/stdout"
-
-shell "cmp -s ${tmpdir}/p1/stdout ${tmpdir}/p2/stdout"
-
-shell -expect "cache_hit" "varnishstat -1 -n ${v1_name} -f MAIN.cache_hit"
diff --git a/bin/varnishtest/tests/u00005.vtc b/bin/varnishtest/tests/u00005.vtc
index b331d26..031b79c 100644
--- a/bin/varnishtest/tests/u00005.vtc
+++ b/bin/varnishtest/tests/u00005.vtc
@@ -7,19 +7,43 @@ server s1 {
 
 varnish v1 -vcl+backend {} -start
 
+# On fast systems the next varnishstat will return "inf" counters
+# if we don't give varnishd a chance to get going.
+
+delay 1
+
+process p1 {varnishstat -1 -n ${v1_name} -f ^LCK.vbe.destroy \
+	-f LCK.vbe.* -f LCK.mempool.* | tr '[1-9]' '0'} -run
+
+shell "grep -q vbe ${tmpdir}/p1/stdout"
+shell "grep -q mempool ${tmpdir}/p1/stdout"
+shell -err "grep -q LCK.vbe.destroy ${tmpdir}/p1/stdout"
+
+process p2 {varnishstat -1 -n ${v1_name} -f ^*vbe.destroy \
+	-f *vbe* -f *mempool* | tr '[1-9]' '0'} -run
+
+shell "grep -q vbe ${tmpdir}/p2/stdout"
+shell "grep -q mempool ${tmpdir}/p2/stdout"
+shell -err "grep -q LCK.vbe.destroy ${tmpdir}/p2/stdout"
+
+shell "cmp -s ${tmpdir}/p1/stdout ${tmpdir}/p2/stdout"
+
+shell -expect "cache_hit" \
+	"varnishstat -1 -n ${v1_name} -f MAIN.cache_hit"
+
 shell -expect "Usage: varnishstat <options>" \
-	"varnishstat -n ${v1_name} -h"
+	"varnishstat -h"
 shell -expect "Varnishstat -f option fields:" \
 	"varnishstat -n ${v1_name} -l"
 shell -expect "Copyright (c) 2006 Verdens Gang AS" \
-	"varnishstat -n ${v1_name} -V"
+	"varnishstat -V"
+shell -err -expect "Usage: varnishstat <options>" \
+	"varnishstat extra"
+shell -err -expect "Cannot open /nonexistent/_.vsm" \
+	"varnishstat -n /nonexistent"
 shell -expect "MAIN.uptime" \
 	"varnishstat -n ${v1_name} -1"
 shell -expect "<type>MAIN</type>" \
 	"varnishstat -n ${v1_name} -x"
 shell -expect "MAIN.uptime\":" \
 	"varnishstat -n ${v1_name} -j"
-shell -err -expect "Usage: varnishstat <options>" \
-	"varnishstat -n ${v1_name} extra"
-shell -err -expect "Cannot open /nonexistent/_.vsm" \
-	"varnishstat -n /nonexistent"
diff --git a/bin/varnishtest/tests/u00006.vtc b/bin/varnishtest/tests/u00006.vtc
index 8ab806c..60092e9 100644
--- a/bin/varnishtest/tests/u00006.vtc
+++ b/bin/varnishtest/tests/u00006.vtc
@@ -15,15 +15,29 @@ process p3 {
 	exec varnishlog -n ${v1_name} -g raw -k 1 -w ${tmpdir}/p3/output.bin
 } -start
 shell -expect "Usage: varnishlog <options>" \
-	"varnishlog -n ${v1_name} -h"
+	"varnishlog -h"
 shell -expect "Copyright (c) 2006 Verdens Gang AS" \
-	"varnishlog -n ${v1_name} -V"
+	"varnishlog -V"
 shell -err -expect "Usage: varnishlog <options>" \
-	"varnishlog -n ${v1_name} extra"
+	"varnishlog extra"
 shell -err -expect "Missing -w option" \
-	"varnishlog -n ${v1_name} -D"
+	"varnishlog -D"
 shell -err -expect "-L: Range error" \
-	"varnishlog -n ${v1_name} -L 0"
+	"varnishlog -L 0"
+shell -err -expect {-i: "foo" matches zero tags} \
+	"varnishlog -i foo"
+shell -err -expect {-i: "Resp" is ambiguous} \
+	"varnishlog -i Resp"
+shell -err -expect {-I: "foo" matches zero tags} \
+	"varnishlog -I foo:bar"
+shell -err -expect {-I: "Resp" is ambiguous} \
+	"varnishlog -I Resp:bar"
+shell -err -expect {-I: Regex error at position 4 (missing ))} \
+	{varnishlog -I "(foo"}
+shell -err -expect {-x: Syntax error in "**"} \
+	{varnishlog -x "**"}
+shell -err -expect {-X: Syntax error in "**"} \
+	{varnishlog -X "**:bar"}
 process p1 -wait
 shell {grep -q "0 CLI" ${tmpdir}/p1/stdout}
 process p2 -wait