Commit b264be7b authored by Federico G. Schwindt's avatar Federico G. Schwindt

More coverage

parent 489dcd62
...@@ -22,10 +22,6 @@ shell -err "grep -q LCK.vbe.destroy ${p1_out}" ...@@ -22,10 +22,6 @@ shell -err "grep -q LCK.vbe.destroy ${p1_out}"
process p2 {varnishstat -1 -n ${v1_name} -f ^*vbe.destroy \ process p2 {varnishstat -1 -n ${v1_name} -f ^*vbe.destroy \
-f *vbe* -f *mempool* | tr '[1-9]' '0'} -run -f *vbe* -f *mempool* | tr '[1-9]' '0'} -run
shell "grep -q vbe ${p2_out}"
shell "grep -q mempool ${p2_out}"
shell -err "grep -q LCK.vbe.destroy ${p2_out}"
shell "cmp -s ${p1_out} ${p2_out}" shell "cmp -s ${p1_out} ${p2_out}"
shell -expect "cache_hit" \ shell -expect "cache_hit" \
...@@ -39,8 +35,12 @@ shell -expect "Copyright (c) 2006 Verdens Gang AS" \ ...@@ -39,8 +35,12 @@ shell -expect "Copyright (c) 2006 Verdens Gang AS" \
"varnishstat -V" "varnishstat -V"
shell -err -expect "Usage: varnishstat <options>" \ shell -err -expect "Usage: varnishstat <options>" \
"varnishstat extra" "varnishstat extra"
shell -err -expect "-t: Range error" \
"varnishstat -n /nonexistent -t -1"
shell -err -expect "-t: Syntax error" \
"varnishstat -n /nonexistent -t foo"
shell -err -expect "Cannot open /nonexistent/_.vsm" \ shell -err -expect "Cannot open /nonexistent/_.vsm" \
"varnishstat -n /nonexistent" "varnishstat -n /nonexistent -t 1"
shell -expect "MAIN.uptime" \ shell -expect "MAIN.uptime" \
"varnishstat -n ${v1_name} -1" "varnishstat -n ${v1_name} -1"
shell -expect "<type>MAIN</type>" \ shell -expect "<type>MAIN</type>" \
......
...@@ -41,6 +41,8 @@ shell -err -expect {-X: Syntax error in "**"} \ ...@@ -41,6 +41,8 @@ shell -err -expect {-X: Syntax error in "**"} \
{varnishlog -X "**:bar"} {varnishlog -X "**:bar"}
shell -err -expect "Cannot open output file (No such file or directory)" \ shell -err -expect "Cannot open output file (No such file or directory)" \
{varnishlog -w /nonexistent/file} {varnishlog -w /nonexistent/file}
shell -err -expect "Only one of -n, -N and -r options may be used" \
{varnishlog -n ${v1_name} -N ${v1_name}/_.vsm}
process p1 -wait process p1 -wait
shell {grep -q "0 CLI" ${tmpdir}/vlog} shell {grep -q "0 CLI" ${tmpdir}/vlog}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment