[master] 57bf3c576 r3940: tolerate v1 panic registration

Nils Goroll nils.goroll at uplex.de
Mon Jul 3 19:43:05 UTC 2023


commit 57bf3c5766a326d4dc97d479974c10cf4377d49f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 3 21:42:25 2023 +0200

    r3940: tolerate v1 panic registration
    
    Some systems see it, others not

diff --git a/bin/varnishtest/tests/r03940.vtc b/bin/varnishtest/tests/r03940.vtc
index b017adc5c..4da082c2d 100644
--- a/bin/varnishtest/tests/r03940.vtc
+++ b/bin/varnishtest/tests/r03940.vtc
@@ -12,8 +12,11 @@ varnish v1 -arg "-sdebug=debug,dinit=5s -pstartup_timeout=3s -pcli_timeout=2s" \
 varnish v1 -cliexpect \
 	"Child failed on launch within startup_timeout=3.00s" \
 	"start"
+# v1 registers a panic on some systems, but not others
+shell {varnishadm -n ${v1_name} panic.clear || true }
 varnish v1 -wait
 
+
 process p1 { varnishd \
 	-sdebug=debug,dinit=5s \
 	-pstartup_timeout=3s -pcli_timeout=2s \


More information about the varnish-commit mailing list