[master] 011d4e2 Change these tests to use err_shell

Poul-Henning Kamp phk at FreeBSD.org
Mon Mar 16 09:55:34 CET 2015


commit 011d4e2ced8536c687d37ef3c8eb9306f8fd6ba5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Mar 16 08:55:13 2015 +0000

    Change these tests to use err_shell

diff --git a/bin/varnishtest/tests/a00009.vtc b/bin/varnishtest/tests/a00009.vtc
index e5abeb7..13bd015 100644
--- a/bin/varnishtest/tests/a00009.vtc
+++ b/bin/varnishtest/tests/a00009.vtc
@@ -3,7 +3,7 @@ varnishtest "Code coverage of VCL compiler and RSTdump etc"
 shell "${varnishd} -b 127.0.0.1:80 -C -n ${tmpdir} > /dev/null 2>&1"
 shell "${varnishd} -x dumprstparam > /dev/null 2>&1"
 shell "${varnishd} -x dumprstvsl > /dev/null 2>&1"
-shell "! ${varnishd} -spersistent > /dev/null 2>&1"
-shell "! ${varnishd} -jxyz > /dev/null 2>&1"
-shell "! ${varnishd} -jnone -jxyz > /dev/null 2>&1"
-shell "! ${varnishd} -d -jxyz > /dev/null 2>&1"
+err_shell {-spersistent has been deprecated} "${varnishd} -spersistent 2>&1"
+err_shell {Unknown jail method "xyz"} "${varnishd} -jxyz 2>&1"
+err_shell {-j must be the first argument} "${varnishd} -jnone -jxyz 2>&1"
+err_shell {-j must be the first argument} "${varnishd} -d -jxyz 2>&1"



More information about the varnish-commit mailing list