To prevent masking bugs, disable auto_restart by default.

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

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3769 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishtest/tests/v00010.vtc b/varnish-cache/bin/varnishtest/tests/v00010.vtc
index d3f5a12ba978ff6d1b9f78c5e2acd6e3283b45b7..c534cdf09184ffc724d11ec299b48c2c653953f4 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/v00010.vtc
+++ b/varnish-cache/bin/varnishtest/tests/v00010.vtc
@@ -17,7 +17,12 @@ varnish v1 -vcl+backend {
                        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 {

diff --git a/varnish-cache/bin/varnishtest/vtc_varnish.c b/varnish-cache/bin/varnishtest/vtc_varnish.c
index 9756460c32ee527a5d08298a404de5f74a6bfabd..6a84ca76a07c4ce4d185f4e088a244bc624f1ce0 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_varnish.c
+++ b/varnish-cache/bin/varnishtest/vtc_varnish.c
@@ -208,6 +208,7 @@ varnish_launch(struct varnish *v)
        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);