summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faulet <cfaulet@haproxy.com>2021-01-05 15:42:51 +0100
committerChristopher Faulet <cfaulet@haproxy.com>2021-01-26 13:06:03 +0100
commit915d3c6ed298862683a49fcc223ecc576029879d (patch)
treec16b1850779ac83943700073fd08063ed02d248c
parent6ff895cff03e7a1605f5a706058049fc625224e0 (diff)
downloadhaproxy-20210122-htx-fl-eom-and-websockets-3.tar.gz
REGTEST: Don't use the websocket to validate http-check20210122-htx-fl-eom-and-websockets-3
Now, some conformance tests are performed when an HTTP connection is upgraded to websocket. This make the http-check-send.vtc script failed for the backend <be6_ws>. Because the purpose of this health-check is to pass a "Connection: Upgrade" header on an http-check send rule, we may use a dummy protocal instead.
-rw-r--r--reg-tests/checks/http-check-send.vtc6
1 files changed, 3 insertions, 3 deletions
diff --git a/reg-tests/checks/http-check-send.vtc b/reg-tests/checks/http-check-send.vtc
index 3c07e1c74..9773805a0 100644
--- a/reg-tests/checks/http-check-send.vtc
+++ b/reg-tests/checks/http-check-send.vtc
@@ -72,11 +72,11 @@ server s6 {
expect req.proto == HTTP/1.1
expect req.http.host == "ws-host"
expect req.http.connection == "upgrade"
- expect req.http.upgrade == "websocket"
+ expect req.http.upgrade == "raw-proto"
txresp \
-status 101 \
-hdr "connection: upgrade" \
- -hdr "upgrade: websocket"
+ -hdr "upgrade: raw-proto"
} -start
@@ -154,7 +154,7 @@ haproxy h1 -conf {
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 websocket
+ 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