[master] 21cc7fc5d Make this test work on FreeBSD.

Poul-Henning Kamp phk at FreeBSD.org
Mon Apr 29 09:28:08 UTC 2019


commit 21cc7fc5d259266ce3c42583d32a74846606608f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Apr 29 09:26:49 2019 +0000

    Make this test work on FreeBSD.

diff --git a/bin/varnishtest/tests/s00010.vtc b/bin/varnishtest/tests/s00010.vtc
index 9097e4fd9..6c2a5be37 100644
--- a/bin/varnishtest/tests/s00010.vtc
+++ b/bin/varnishtest/tests/s00010.vtc
@@ -1,17 +1,20 @@
 varnishtest "client h1 send timeouts"
 
 # XXX See https://github.com/varnishcache/varnish-cache/pull/2980#issuecomment-486214661
-feature cmd {test $(uname) = "Linux"}
+feature cmd {test $(uname) != "SunOS"}
 
 server s1 {
 	rxreq
 	txresp -bodylen 100000
 } -start
 
-varnish v1 -arg "-p timeout_idle=1"    \
-	   -arg "-a 127.0.0.1:0"	\
-	   -arg "-a ${tmpdir}/v1.sock"	\
-	   -vcl+backend {
+varnish v1 				\
+	-arg "-p timeout_idle=1"	\
+	-arg "-p idle_send_timeout=.1"	\
+	-arg "-p send_timeout=.1"	\
+	-arg "-a 127.0.0.1:0"		\
+	-arg "-a ${tmpdir}/v1.sock"	\
+	-vcl+backend {
 	import debug;
 
 	sub vcl_deliver {
@@ -19,8 +22,6 @@ varnish v1 -arg "-p timeout_idle=1"    \
 	}
 } -start
 
-varnish v1 -cliok "param.set send_timeout 1"
-
 logexpect l1 -v v1 {
 	expect * * Debug "Hit total send timeout"
 	expect * * Debug "Hit total send timeout"


More information about the varnish-commit mailing list