[master] 5c0be22 Use the regular timeout when waiting for a close

Poul-Henning Kamp phk at FreeBSD.org
Tue Apr 7 10:13:42 CEST 2015


commit 5c0be22ac587deff334e60ef0036722cf7a251a1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Apr 7 08:02:45 2015 +0000

    Use the regular timeout when waiting for a close

diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 2b84b43..2cd7ad7 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -1164,7 +1164,7 @@ cmd_http_expect_close(CMD_ARGS)
 		fds[0].fd = hp->fd;
 		fds[0].events = POLLIN | POLLERR;
 		fds[0].revents = 0;
-		i = poll(fds, 1, 1000);
+		i = poll(fds, 1, hp->timeout);
 		if (i == 0)
 			vtc_log(vl, hp->fatal, "Expected close: timeout");
 		if (i != 1 || !(fds[0].revents & POLLIN))



More information about the varnish-commit mailing list