[master] de1aa79aa extend send_timeout test to uds
Nils Goroll
nils.goroll at uplex.de
Wed Apr 24 12:04:07 UTC 2019
commit de1aa79aa5d720c775f379da80bced47fcbf52e7
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Wed Apr 24 14:02:25 2019 +0200
extend send_timeout test to uds
diff --git a/bin/varnishtest/tests/s00010.vtc b/bin/varnishtest/tests/s00010.vtc
index 1c21dd58b..c641db519 100644
--- a/bin/varnishtest/tests/s00010.vtc
+++ b/bin/varnishtest/tests/s00010.vtc
@@ -5,7 +5,10 @@ server s1 {
txresp -bodylen 100000
} -start
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p timeout_idle=1" \
+ -arg "-a 127.0.0.1:0" \
+ -arg "-a ${tmpdir}/v1.sock" \
+ -vcl+backend {
import debug;
sub vcl_deliver {
@@ -17,6 +20,7 @@ varnish v1 -cliok "param.set send_timeout 1"
logexpect l1 -v v1 {
expect * * Debug "Hit total send timeout"
+ expect * * Debug "Hit total send timeout"
} -start
client c1 -rcvbuf 128 {
@@ -24,8 +28,17 @@ client c1 -rcvbuf 128 {
rxresphdrs
# keep the session open for 2 seconds
delay 2
-} -run
+} -start
+
+client c1u -connect "${tmpdir}/v1.sock" -rcvbuf 128 {
+ txreq
+ rxresphdrs
+ # keep the session open for 2 seconds
+ delay 2
+} -start
+client c1 -wait
+client c1u -wait
logexpect l1 -wait
feature SO_RCVTIMEO_WORKS
@@ -34,6 +47,7 @@ varnish v1 -cliok "param.reset send_timeout"
logexpect l2 -v v1 {
expect * * Debug "Hit idle send timeout"
+ expect * * Debug "Hit idle send timeout"
} -start
client c2 -rcvbuf 128 {
@@ -41,6 +55,15 @@ client c2 -rcvbuf 128 {
rxresphdrs
# keep the session open for 2 seconds
delay 2
-} -run
+} -start
+
+client c2u -connect "${tmpdir}/v1.sock" -rcvbuf 128 {
+ txreq
+ rxresphdrs
+ # keep the session open for 2 seconds
+ delay 2
+} -start
+client c2 -wait
+client c2u -wait
logexpect l2 -wait
More information about the varnish-commit
mailing list