REGTESTS: unbreak http-check-send.vtc
As noticed by Christopher, I messed up the version fix in commit
cb4ed02ef ("REGTESTS: mark http-check-send.vtc as 2.4-only"), as while
looking up the commit introducing the change I accidently reverted it.
Let's reinsert the contents of the file prior to that fix, except the
version, of course.
diff --git a/reg-tests/checks/http-check-send.vtc b/reg-tests/checks/http-check-send.vtc
index f281f10..76fd584 100644
--- a/reg-tests/checks/http-check-send.vtc
+++ b/reg-tests/checks/http-check-send.vtc
@@ -19,6 +19,7 @@
expect req.method == GET
expect req.url == /test
expect req.proto == HTTP/1.1
+ expect req.http.connection == "close"
txresp
} -start
@@ -39,6 +40,7 @@
expect req.method == GET
expect req.url == /status
expect req.proto == HTTP/1.1
+ expect req.http.connection == "close"
expect req.http.hdr == <undef>
expect req.http.host == "my-www-host"
expect req.http.x-test == true
@@ -63,6 +65,20 @@
txresp
} -start
+server s6 {
+ rxreq
+ expect req.method == GET
+ expect req.url == /
+ expect req.proto == HTTP/1.1
+ expect req.http.host == "ws-host"
+ expect req.http.connection == "upgrade"
+ expect req.http.upgrade == "raw-proto"
+ txresp \
+ -status 101 \
+ -hdr "connection: upgrade" \
+ -hdr "upgrade: raw-proto"
+} -start
+
syslog S1 -level notice {
recv
@@ -89,6 +105,11 @@
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be5/srv succeeded.*code: 200"
} -start
+syslog S6 -level notice {
+ recv
+ expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Health check for server be6_ws/srv succeeded.*code: 101"
+} -start
+
haproxy h1 -conf {
defaults
@@ -131,6 +152,12 @@
http-check send hdr Host "other-www-host" hdr X-New-Test true body "other test"
server srv ${s5_addr}:${s5_port} check inter 200ms rise 1 fall 1
+ backend be6_ws
+ log ${S6_addr}:${S6_port} len 2048 local0
+ http-check send meth GET uri / ver HTTP/1.1 hdr host ws-host hdr connection upgrade hdr upgrade raw-proto
+ http-check expect status 101
+ server srv ${s6_addr}:${s6_port} check inter 200ms rise 1 fall 1
+
} -start
syslog S1 -wait
@@ -138,3 +165,4 @@
syslog S3 -wait
syslog S4 -wait
syslog S5 -wait
+syslog S6 -wait