[master] 4518b0b A few more tests

Federico G. Schwindt fgsch at lodoss.net
Mon May 8 01:39:05 CEST 2017


commit 4518b0b74da68ddc32367422970e581078d5ab72
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon May 8 00:26:11 2017 +0100

    A few more tests

diff --git a/bin/varnishtest/tests/u00005.vtc b/bin/varnishtest/tests/u00005.vtc
index cd87c93..45a533e 100644
--- a/bin/varnishtest/tests/u00005.vtc
+++ b/bin/varnishtest/tests/u00005.vtc
@@ -36,9 +36,9 @@ shell -expect "Copyright (c) 2006 Verdens Gang AS" \
 shell -err -expect "Usage: varnishstat <options>" \
 	"varnishstat extra"
 shell -err -expect "-t: Range error" \
-	"varnishstat -n /nonexistent -t -1"
+	"varnishstat -t -1"
 shell -err -expect "-t: Syntax error" \
-	"varnishstat -n /nonexistent -t foo"
+	"varnishstat -t foo"
 shell -err -expect "Cannot open /nonexistent/_.vsm" \
 	"varnishstat -n /nonexistent -t 1"
 shell -expect "MAIN.uptime" \
diff --git a/bin/varnishtest/tests/u00006.vtc b/bin/varnishtest/tests/u00006.vtc
index 196514e..35c8e01 100644
--- a/bin/varnishtest/tests/u00006.vtc
+++ b/bin/varnishtest/tests/u00006.vtc
@@ -23,6 +23,12 @@ shell -err -expect "Usage: varnishlog <options>" \
 	"varnishlog extra"
 shell -err -expect "Missing -w option" \
 	"varnishlog -D"
+shell -err -expect "Ambiguous grouping type: r" \
+	"varnishlog -g r"
+shell -err -expect "Unknown grouping type: foo" \
+	"varnishlog -g foo"
+shell -err -expect "-k: Invalid number 'foo'" \
+	"varnishlog -k foo"
 shell -err -expect "-L: Range error" \
 	"varnishlog -L 0"
 shell -err -expect {-i: "foo" matches zero tags} \
@@ -35,6 +41,10 @@ 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 "-t: Range error" \
+	"varnishlog -t -1"
+shell -err -expect "-t: Syntax error" \
+	"varnishlog -t foo"
 shell -err -expect {-x: Syntax error in "**"} \
 	{varnishlog -x "**"}
 shell -err -expect {-X: Syntax error in "**"} \



More information about the varnish-commit mailing list