[master] 760c4f6 This test needs to wait for s2 also, otherwise the "expect" there may never be reached.
Poul-Henning Kamp
phk at varnish-cache.org
Mon Mar 4 12:03:28 CET 2013
commit 760c4f6548b0e854affeccf81266dc2b1714ff04
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Mar 4 11:02:21 2013 +0000
This test needs to wait for s2 also, otherwise the "expect" there may
never be reached.
Split out the param settings, so we can see the previous values.
diff --git a/bin/varnishtest/tests.disabled/r01252.vtc b/bin/varnishtest/tests.disabled/r01252.vtc
index c988da6..14d1d28 100644
--- a/bin/varnishtest/tests.disabled/r01252.vtc
+++ b/bin/varnishtest/tests.disabled/r01252.vtc
@@ -19,7 +19,7 @@ server s2 {
txresp
} -start
-varnish v1 -arg "-p debug=+waitinglist -p tcp_keepalive_time=1s -p tcp_keepalive_probes=1 -p tcp_keepalive_intvl=1s -p first_byte_timeout=70" -vcl+backend {
+varnish v1 -arg "-p debug=+waitinglist" -vcl+backend {
sub vcl_recv {
if (req.http.x-client == "2") {
set req.backend = s2;
@@ -27,6 +27,18 @@ varnish v1 -arg "-p debug=+waitinglist -p tcp_keepalive_time=1s -p tcp_keepalive
}
} -start
+varnish v1 -cliok "param.show tcp_keepalive_time"
+varnish v1 -cliok "param.set tcp_keepalive_time 1s"
+
+varnish v1 -cliok "param.show tcp_keepalive_probes"
+varnish v1 -cliok "param.set tcp_keepalive_probes 1"
+
+varnish v1 -cliok "param.show tcp_keepalive_intvl"
+varnish v1 -cliok "param.set tcp_keepalive_intvl 1s"
+
+varnish v1 -cliok "param.show first_byte_timeout"
+varnish v1 -cliok "param.set first_byte_timeout 70s"
+
client c1 {
timeout 70
txreq -hdr "X-Client: 1"
@@ -42,3 +54,4 @@ client c2 {
client c1 -wait
client c2 -wait
+server s2 -wait
More information about the varnish-commit
mailing list