[master] efa265b Make this test less sensitive to varnishd running in the background

Poul-Henning Kamp phk at FreeBSD.org
Mon Oct 10 15:57:04 CEST 2016


commit efa265b06600c8badbd62e3926248716c4ef0816
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 10 13:55:51 2016 +0000

    Make this test less sensitive to varnishd running in the background

diff --git a/bin/varnishtest/tests/u00002.vtc b/bin/varnishtest/tests/u00002.vtc
index 9f083ec..662c124 100644
--- a/bin/varnishtest/tests/u00002.vtc
+++ b/bin/varnishtest/tests/u00002.vtc
@@ -10,14 +10,14 @@ varnish v1 -vcl+backend {} -start
 delay 1
 
 process p1 {varnishstat -1 -n ${v1_name} -f ^LCK.vbe.destroy \
-	-f LCK.vbe.* -f LCK.mempool.*} -run
+	-f ^*.locks -f LCK.vbe.* -f LCK.mempool.*} -run
 
 shell "grep -q vbe ${tmpdir}/p1/stdout"
 shell "grep -q mempool ${tmpdir}/p1/stdout"
 err_shell "" "grep -q LCK.vbe.destroy ${tmpdir}/p1/stdout"
 
 process p2 {varnishstat -1 -n ${v1_name} -f ^*vbe.destroy \
-	-f *vbe* -f *mempool*} -run
+	-f ^*.locks -f *vbe* -f *mempool*} -run
 
 shell "grep -q vbe ${tmpdir}/p2/stdout"
 shell "grep -q mempool ${tmpdir}/p2/stdout"



More information about the varnish-commit mailing list