[master] 318ad63 Fix previous and add another case

Federico G. Schwindt fgsch at lodoss.net
Fri Jan 20 23:15:04 CET 2017


commit 318ad63b4f4a49d4e96179ef1bd966391e3638e2
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Jan 20 22:10:04 2017 +0000

    Fix previous and add another case

diff --git a/bin/varnishtest/tests/u00003.vtc b/bin/varnishtest/tests/u00003.vtc
index 4b7eba2..77b09dd 100644
--- a/bin/varnishtest/tests/u00003.vtc
+++ b/bin/varnishtest/tests/u00003.vtc
@@ -38,9 +38,11 @@ shell -err -expect "Syntax error. Field specifier must be positive: Begin[0]" \
 shell -err -expect "Field specifier 999999999999 for the tag VSL:Begin[999999999999] is probably too high" \
 	{varnishncsa -F "%{VSL:Begin[999999999999]}x"}
 shell -err -expect "Can't open format file (No such file or directory)" \
-	{varnishncsa -n ${v1_name} -f /nonexistent}
+	{varnishncsa -f /nonexistent/file}
 shell -err -expect "Empty format file" \
-	{varnishncsa -n ${v1_name} -f /dev/null}
+	{varnishncsa -f /dev/null}
+shell -err -expect "Can't read format from file (Is a directory)" \
+	{varnishncsa -f ${tmpdir}}
 
 delay 1
 
@@ -67,5 +69,5 @@ shell "grep -q /foo ${tmpdir}/ncsa.old.log"
 shell "grep -q /bar ${tmpdir}/ncsa.log"
 
 shell {echo "%{VSL:Begin}x %{Varnish:vxid}x %D %T %{Varnish:handling}x %{%Z}t" >${tmpdir}/format}
-shell -expect "0 miss GMT" \
+shell -expect "0 miss" \
 	{varnishncsa -n ${v1_name} -d -f ${tmpdir}/format}



More information about the varnish-commit mailing list