From 211d540a812f01647464ab9376c339baf056ab29 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 13 Dec 2018 17:29:20 +0100 Subject: [PATCH] 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. --- reg-tests/http-rules/h00001.vtc | 9 +++++++++ reg-tests/http-rules/h00002.vtc | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/reg-tests/http-rules/h00001.vtc b/reg-tests/http-rules/h00001.vtc index ca86f1b90..2056ea732 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 b1a6b7b13..1f3c29d97 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 -- 2.47.3