REGTESTS: Send valid URIs in peers reg-tests and fix HA config to avoid warnings
Absolute path must be used, otherwise, the requests are rejected by HAProxy
because of the recent changes. In addition, the configuration has been slightly
updated to remove warnings at startup.
diff --git a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
index 6a28eb1..b145ac8 100644
--- a/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
+++ b/reg-tests/peers/tls_basic_sync_wo_stkt_backend.vtc
@@ -22,12 +22,14 @@
frontend fe
bind "fd@${fe}"
+ tcp-request inspect-delay 100ms
tcp-request content track-sc0 url table peers/stkt
tcp-request content sc-inc-gpc0(0)
}
haproxy h2 -arg "-L B" -conf {
defaults
+ mode http
timeout client 1s
timeout connect 1s
timeout server 1s
@@ -49,6 +51,7 @@
haproxy h3 -arg "-L C" -conf {
defaults
+ mode http
timeout client 1s
timeout connect 1s
timeout server 1s
@@ -70,6 +73,7 @@
haproxy h4 -arg "-L D" -conf {
defaults
+ mode http
timeout client 1s
timeout connect 1s
timeout server 1s
@@ -91,22 +95,22 @@
}
client c1 -connect ${h1_fe_sock} {
- txreq -url "c1_client"
+ txreq -url "/c1_client"
expect_close
} -start
client c2 -connect ${h1_fe_sock} {
- txreq -url "c2_client"
+ txreq -url "/c2_client"
expect_close
} -start
client c3 -connect ${h1_fe_sock} {
- txreq -url "c3_client"
+ txreq -url "/c3_client"
expect_close
} -start
client c4 -connect ${h1_fe_sock} {
- txreq -url "c4_client"
+ txreq -url "/c4_client"
expect_close
} -start
@@ -128,17 +132,17 @@
haproxy h1 -cli {
send "show table peers/stkt"
- expect ~ "# table: peers/stkt, type: string, size:1048[0-9]{4}, used:4(\n0x[0-9a-f]*: key=c[1-4]_client use=0 exp=0 server_id=0 gpc0=1 conn_rate\\(50000\\)=1 conn_cur=0){4}"
+ expect ~ "# table: peers/stkt, type: string, size:1048[0-9]{4}, used:4(\n0x[0-9a-f]*: key=/c[1-4]_client use=0 exp=0 server_id=0 gpc0=1 conn_rate\\(50000\\)=1 conn_cur=0){4}"
}
haproxy h2 -cli {
send "show table peers/stkt"
- expect ~ "# table: peers/stkt, type: string, size:1048[0-9]{4}, used:4(\n0x[0-9a-f]*: key=c[1-4]_client use=0 exp=0 server_id=0 gpc0=1 conn_rate\\(50000\\)=1 conn_cur=0){4}"
+ expect ~ "# table: peers/stkt, type: string, size:1048[0-9]{4}, used:4(\n0x[0-9a-f]*: key=/c[1-4]_client use=0 exp=0 server_id=0 gpc0=1 conn_rate\\(50000\\)=1 conn_cur=0){4}"
}
haproxy h3 -cli {
send "show table peers/stkt"
- expect ~ "# table: peers/stkt, type: string, size:1048[0-9]{4}, used:4(\n0x[0-9a-f]*: key=c[1-4]_client use=0 exp=0 server_id=0 gpc0=1 conn_rate\\(50000\\)=1 conn_cur=0){4}"
+ expect ~ "# table: peers/stkt, type: string, size:1048[0-9]{4}, used:4(\n0x[0-9a-f]*: key=/c[1-4]_client use=0 exp=0 server_id=0 gpc0=1 conn_rate\\(50000\\)=1 conn_cur=0){4}"
}
haproxy h4 -cli {