r3769 - in trunk/varnish-cache/bin/varnishtest: . tests

[phk at projects.linpro.no]

Author: phk
Date: 2009-02-13 14:43:30 +0100 (Fri, 13 Feb 2009)
New Revision: 3769

Modified:
   trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
To prevent masking bugs, disable auto_restart by default.

Enable it explicitly in the one testcase where we check that it works.



Modified: trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc	2009-02-13 13:42:44 UTC (rev 3768)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00010.vtc	2009-02-13 13:43:30 UTC (rev 3769)
@@ -17,9 +17,14 @@
 			panic "Had Panic header: " obj.http.panic;
 		}
 	}
-} -start -cli "param.set diag_bitmap 0x00001000"
+} -start
 
+varnish v1 -cliok "param.set diag_bitmap 0x00001000" 
 
+# varnishtest defaults to auto_restart off, to avoid masking bugs.
+varnish v1 -cliok "param.set auto_restart on" 
+
+
 client c1 {
 	txreq -url "/"
 	rxresp

Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-02-13 13:42:44 UTC (rev 3768)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2009-02-13 13:43:30 UTC (rev 3769)
@@ -208,6 +208,7 @@
 	vsb_printf(vsb, "cd ../varnishd &&");
 	vsb_printf(vsb, " ./varnishd -d -d -n /tmp/__%s", v->name);
 	vsb_printf(vsb, " -p cli_banner=off");
+	vsb_printf(vsb, " -p auto_restart=off");
 	vsb_printf(vsb, " -a '%s' -T %s", v->accept, v->telnet);
 	vsb_printf(vsb, " -P /tmp/__%s/varnishd.pid", v->name);
 	vsb_printf(vsb, " %s", v->args);