From da76459dc21b5af2449af2d36eb95226cb186ce2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 11:35:11 +0200 Subject: Adding upstream version 2.6.12. Signed-off-by: Daniel Baumann --- reg-tests/balance/balance-rr.vtc | 73 ++++++++++++++++++++++ reg-tests/balance/balance-uri-path-only.vtc | 97 +++++++++++++++++++++++++++++ reg-tests/balance/balance-uri.vtc | 74 ++++++++++++++++++++++ 3 files changed, 244 insertions(+) create mode 100644 reg-tests/balance/balance-rr.vtc create mode 100644 reg-tests/balance/balance-uri-path-only.vtc create mode 100644 reg-tests/balance/balance-uri.vtc (limited to 'reg-tests/balance') diff --git a/reg-tests/balance/balance-rr.vtc b/reg-tests/balance/balance-rr.vtc new file mode 100644 index 0000000..908a4f9 --- /dev/null +++ b/reg-tests/balance/balance-rr.vtc @@ -0,0 +1,73 @@ +vtest "Test for balance roundrobin" +feature ignore_unknown_macro + +server s1 { + rxreq + txresp -hdr "Server: s1" +} -repeat 2 -start + +server s2 { + rxreq + txresp -hdr "Server: s2" +} -repeat 2 -start + +server s3 { + rxreq + txresp -hdr "Server: s3" +} -repeat 2 -start + +server s4 { + rxreq + txresp -hdr "Server: s4" +} -repeat 2 -start + +haproxy h1 -arg "-L A" -conf { + defaults + mode http + timeout server "${HAPROXY_TEST_TIMEOUT-5s}" + timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" + timeout client "${HAPROXY_TEST_TIMEOUT-5s}" + + listen px + bind "fd@${px}" + balance roundrobin + server srv1 ${s1_addr}:${s1_port} + server srv2 ${s2_addr}:${s2_port} + server srv3 ${s3_addr}:${s3_port} + server srv4 ${s4_addr}:${s4_port} +} -start + +client c1 -connect ${h1_px_sock} { + txreq -url "/url1" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s1 +} -run + +client c2 -connect ${h1_px_sock} { + txreq -url "/url1" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s2 +} -run + +client c3 -connect ${h1_px_sock} { + txreq -url "/url1" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s3 +} -run + +client c4 -connect ${h1_px_sock} { + txreq -url "/url1" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s4 +} -run + +client c5 -connect ${h1_px_sock} { + txreq -url "/url1" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s1 +} -run diff --git a/reg-tests/balance/balance-uri-path-only.vtc b/reg-tests/balance/balance-uri-path-only.vtc new file mode 100644 index 0000000..f1291ee --- /dev/null +++ b/reg-tests/balance/balance-uri-path-only.vtc @@ -0,0 +1,97 @@ +vtest "Test for balance URI" +feature ignore_unknown_macro +#REQUIRE_VERSION=2.3 + +server s1 { + rxreq + txresp -hdr "Server: s1" -body "s1" +} -repeat 5 -start + +server s2 { + rxreq + txresp -hdr "Server: s2" -body "s2" +} -repeat 5 -start + +server s3 { + rxreq + txresp -hdr "Server: s3" -body "s3" +} -repeat 5 -start + +server s4 { + rxreq + txresp -hdr "Server: s4" -body "s4" +} -repeat 5 -start + +haproxy h1 -arg "-L A" -conf { + defaults + mode http + timeout server "${HAPROXY_TEST_TIMEOUT-5s}" + timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" + timeout client "${HAPROXY_TEST_TIMEOUT-5s}" + + listen px + bind "fd@${px}" + bind "fd@${pxh2}" proto h2 + balance uri path-only + server srv1 ${s1_addr}:${s1_port} + server srv2 ${s2_addr}:${s2_port} + server srv3 ${s3_addr}:${s3_port} + server srv4 ${s4_addr}:${s4_port} +} -start + +client c1 -connect ${h1_px_sock} { + txreq -url "http://127.0.0.1/url1" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s2 +} -run + +client c2 -connect ${h1_px_sock} { + txreq -url "/url1?ignore=this-arg" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s2 +} -run + +client c3 -connect ${h1_px_sock} { + txreq -url "http://127.0.0.1/url2" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s3 +} -run + +client c4 -connect ${h1_px_sock} { + txreq -url "/url3" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s4 +} -run + +client c5 -connect ${h1_px_sock} { + txreq -url "/url4" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s1 +} -run + +client c6h2 -connect ${h1_pxh2_sock} { + txpri + stream 0 { + txsettings + rxsettings + txsettings -ack + rxsettings + expect settings.ack == true + } -run + + stream 1 { + txreq \ + -req "GET" \ + -scheme "https" \ + -url "/url1" + rxhdrs + expect resp.status == 200 + rxdata -all + expect resp.body == "s2" + } -run +} -run diff --git a/reg-tests/balance/balance-uri.vtc b/reg-tests/balance/balance-uri.vtc new file mode 100644 index 0000000..cc65d64 --- /dev/null +++ b/reg-tests/balance/balance-uri.vtc @@ -0,0 +1,74 @@ +vtest "Test for balance URI" +feature ignore_unknown_macro +#REQUIRE_VERSION=2.0 + +server s1 { + rxreq + txresp -hdr "Server: s1" +} -repeat 2 -start + +server s2 { + rxreq + txresp -hdr "Server: s2" +} -repeat 2 -start + +server s3 { + rxreq + txresp -hdr "Server: s3" +} -repeat 2 -start + +server s4 { + rxreq + txresp -hdr "Server: s4" +} -repeat 2 -start + +haproxy h1 -arg "-L A" -conf { + defaults + mode http + timeout server "${HAPROXY_TEST_TIMEOUT-5s}" + timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" + timeout client "${HAPROXY_TEST_TIMEOUT-5s}" + + listen px + bind "fd@${px}" + balance uri + server srv1 ${s1_addr}:${s1_port} + server srv2 ${s2_addr}:${s2_port} + server srv3 ${s3_addr}:${s3_port} + server srv4 ${s4_addr}:${s4_port} +} -start + +client c1 -connect ${h1_px_sock} { + txreq -url "/url1" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s2 +} -run + +client c2 -connect ${h1_px_sock} { + txreq -url "/url1?ignore=this-arg" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s2 +} -run + +client c3 -connect ${h1_px_sock} { + txreq -url "/url2" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s3 +} -run + +client c4 -connect ${h1_px_sock} { + txreq -url "/url3" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s4 +} -run + +client c5 -connect ${h1_px_sock} { + txreq -url "/url4" + rxresp + expect resp.status == 200 + expect resp.http.Server ~ s1 +} -run -- cgit v1.2.3