[master] 51a1d5a Use a third logexpect to cope with thread-scheduling/VSL order uncertainty.

Poul-Henning Kamp phk at FreeBSD.org
Wed Nov 15 07:52:08 UTC 2017


commit 51a1d5a87f4f25d535b76fbd3a37c8d74ceb6a70
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 15 07:50:05 2017 +0000

    Use a third logexpect to cope with thread-scheduling/VSL
    order uncertainty.

diff --git a/bin/varnishtest/tests/r02339.vtc b/bin/varnishtest/tests/r02339.vtc
index ef0444e..a3cc99f 100644
--- a/bin/varnishtest/tests/r02339.vtc
+++ b/bin/varnishtest/tests/r02339.vtc
@@ -50,12 +50,17 @@ varnish v1 -arg "-p thread_pools=1" -vcl+backend {
 	}
 } -start
 
+varnish v1 -cliok "param.set timeout_idle 2"
+
 logexpect l0 -v v1 -g raw {
 	expect * 0 ExpKill	"EXP_Expired x=1002"
 } -start
 
-logexpect l1 -v v1 {
+logexpect l2 -v v1 -g raw {
 	expect * 1002	Begin		"bereq 1001 fetch"
+} -start
+
+logexpect l1 -v v1 {
 
 	expect * 1003	VCL_call	HIT
 	expect * =	VCL_call	DELIVER
@@ -108,6 +113,7 @@ client c1 {
 } -run
 
 logexpect l0 -wait
+logexpect l2 -wait
 
 client c1 {
 	txreq -url recv


More information about the varnish-commit mailing list