From 0786e108316af4a3ed995ff45afd75517f625ed7 Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 13 Feb 2009 13:43:30 +0000 Subject: [PATCH] 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 --- varnish-cache/bin/varnishtest/tests/v00010.vtc | 7 ++++++- varnish-cache/bin/varnishtest/vtc_varnish.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/varnish-cache/bin/varnishtest/tests/v00010.vtc b/varnish-cache/bin/varnishtest/tests/v00010.vtc index d3f5a12b..c534cdf0 100644 --- 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 9756460c..6a84ca76 100644 --- 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); -- 2.39.5