From: Willy Tarreau <w@1wt.eu>
Date: Thu, 13 Dec 2018 16:29:20 +0000 (+0100)
Subject: REGTESTS: adjust the http-rules regtest to support window updates
X-Git-Tag: v1.9-dev11~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=211d540a812f01647464ab9376c339baf056ab29;p=thirdparty%2Fhaproxy.git

REGTESTS: adjust the http-rules regtest to support window updates

Varnishtest is not happy to see the window update come before the
settings ACK, as by default it expects exactly tx/rx/txack/rxack.
One workaround could consist in making haproxy send the WU after
the settings ACK but this would be a real hack as the preface is
already finished when sending this ack. Instead, let's make the
initial sequence explicit in the tests.
---

diff --git a/reg-tests/http-rules/h00001.vtc b/reg-tests/http-rules/h00001.vtc
index ca86f1b909..2056ea732a 100644
--- a/reg-tests/http-rules/h00001.vtc
+++ b/reg-tests/http-rules/h00001.vtc
@@ -187,6 +187,15 @@ client c1h1 -connect ${h1_feh1_sock} {
 } -run
 
 client c1h2 -connect ${h1_feh2_sock} {
+	txpri
+	stream 0 {
+		txsettings
+		rxsettings
+		txsettings -ack
+		rxwinup
+		rxsettings
+		expect settings.ack == true
+	} -run
 	stream 1 {
 		# warning: -req, -scheme, -url MUST be placed first otherwise
 		# the H2 protocol is invalid since they are pseudo-headers
diff --git a/reg-tests/http-rules/h00002.vtc b/reg-tests/http-rules/h00002.vtc
index b1a6b7b13f..1f3c29d977 100644
--- a/reg-tests/http-rules/h00002.vtc
+++ b/reg-tests/http-rules/h00002.vtc
@@ -188,6 +188,15 @@ client c1h1 -connect ${h1_feh1_sock} {
 } -run
 
 client c1h2 -connect ${h1_feh2_sock} {
+	txpri
+	stream 0 {
+		txsettings
+		rxsettings
+		txsettings -ack
+		rxwinup
+		rxsettings
+		expect settings.ack == true
+	} -run
 	stream 1 {
 		# warning: -req, -scheme, -url MUST be placed first otherwise
 		# the H2 protocol is invalid since they are pseudo-headers