[master] 3a82481 Make t02007.vtc less flaky

Dag Haavi Finstad daghf at varnish-software.com
Fri Aug 11 14:10:10 CEST 2017


commit 3a82481f9a998784bdaab79d0d84158ab9fc0ba7
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Fri Aug 11 14:07:24 2017 +0200

    Make t02007.vtc less flaky
    
    Add a barrier sync to ensure we get the WINDOW_UPDATE and the DATA
    frames in the expected order.

diff --git a/bin/varnishtest/tests/t02007.vtc b/bin/varnishtest/tests/t02007.vtc
index 8fe8b8d..e4d4699 100644
--- a/bin/varnishtest/tests/t02007.vtc
+++ b/bin/varnishtest/tests/t02007.vtc
@@ -1,5 +1,7 @@
 varnishtest "H2 Huge response headers"
 
+barrier b1 sock 2
+
 server s1 {
 	rxreq
 	expect req.proto == HTTP/1.1
@@ -19,10 +21,22 @@ server s1 {
 	expect req.url == /5
 } -start
 
-varnish v1 -vcl+backend {} -cliok "param.set feature +http2" -start
+
+varnish v1 -cliok "param.set feature +http2"
 varnish v1 -cliok "param.set debug +syncvsl"
 varnish v1 -cliok "param.set debug +h2_nocheck"
 
+varnish v1 -vcl+backend {
+	import debug;
+	sub vcl_deliver {
+		if (req.url == "/1") {
+			if (!debug.barrier_sync("${b1_sock}")) {
+				return (synth(400));
+			}
+		}
+	}
+} -start
+
 client c1 {
 	stream 0 {
 		txsettings -framesize 64
@@ -31,6 +45,7 @@ client c1 {
 	stream 1 {
 		txreq \
 			-req POST \
+			-url /1 \
 			-hdr content-type text/plain \
 			-nostrend \
 			-nohdrend
@@ -50,6 +65,7 @@ client c1 {
 			-data request
 
 		rxwinup
+		barrier b1 sync
 		rxresp
 		expect resp.status == 200
 		expect resp.http.content-Type == "text/plain"



More information about the varnish-commit mailing list