diff --git a/reg-tests/peers/basic_sync.vtc b/reg-tests/peers/basic_sync.vtc index 3dddafa20..1edfae65f 100644 --- a/reg-tests/peers/basic_sync.vtc +++ b/reg-tests/peers/basic_sync.vtc @@ -21,12 +21,14 @@ haproxy h1 -arg "-L A" -conf { frontend fe bind "fd@${fe}" + tcp-request inspect-delay 100ms tcp-request content track-sc0 url table 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 @@ -48,6 +50,7 @@ haproxy h2 -arg "-L B" -conf { haproxy h3 -arg "-L C" -conf { defaults + mode http timeout client 1s timeout connect 1s timeout server 1s @@ -68,22 +71,22 @@ haproxy h3 -arg "-L C" -conf { } 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 @@ -103,16 +106,16 @@ delay 2 haproxy h1 -cli { send "show table stkt" - expect ~ "# table: 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: 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 stkt" - expect ~ "# table: 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: 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 stkt" - expect ~ "# table: 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: 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}" } diff --git a/reg-tests/peers/basic_sync_wo_stkt_backend.vtc b/reg-tests/peers/basic_sync_wo_stkt_backend.vtc index 14d7b00bc..0dce75f69 100644 --- a/reg-tests/peers/basic_sync_wo_stkt_backend.vtc +++ b/reg-tests/peers/basic_sync_wo_stkt_backend.vtc @@ -20,12 +20,14 @@ haproxy h1 -arg "-L A" -conf { 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 @@ -45,6 +47,7 @@ haproxy h2 -arg "-L B" -conf { haproxy h3 -arg "-L C" -conf { defaults + mode http timeout client 1s timeout connect 1s timeout server 1s @@ -63,22 +66,22 @@ haproxy h3 -arg "-L C" -conf { } 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 @@ -98,16 +101,16 @@ delay 2 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}" } diff --git a/reg-tests/peers/tls_basic_sync.vtc b/reg-tests/peers/tls_basic_sync.vtc index d69b01d0a..035abbe6c 100644 --- a/reg-tests/peers/tls_basic_sync.vtc +++ b/reg-tests/peers/tls_basic_sync.vtc @@ -24,12 +24,14 @@ haproxy h1 -arg "-L A" -conf { frontend fe bind "fd@${fe}" + tcp-request inspect-delay 100ms tcp-request content track-sc0 url table 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 @@ -53,6 +55,7 @@ haproxy h2 -arg "-L B" -conf { haproxy h3 -arg "-L C" -conf { defaults + mode http timeout client 1s timeout connect 1s timeout server 1s @@ -76,6 +79,7 @@ haproxy h3 -arg "-L C" -conf { haproxy h4 -arg "-L D" -conf { defaults + mode http timeout client 1s timeout connect 1s timeout server 1s @@ -97,22 +101,22 @@ haproxy h4 -arg "-L D" -conf { } 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 @@ -134,17 +138,17 @@ delay 2 haproxy h1 -cli { send "show table stkt" - expect ~ "# table: 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: 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 stkt" - expect ~ "# table: 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: 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 stkt" - expect ~ "# table: 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: 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 { 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 6a28eb1f4..b145ac862 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 @@ haproxy h1 -arg "-L A" -conf { 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 h2 -arg "-L B" -conf { haproxy h3 -arg "-L C" -conf { defaults + mode http timeout client 1s timeout connect 1s timeout server 1s @@ -70,6 +73,7 @@ haproxy h3 -arg "-L C" -conf { haproxy h4 -arg "-L D" -conf { defaults + mode http timeout client 1s timeout connect 1s timeout server 1s @@ -91,22 +95,22 @@ haproxy h4 -arg "-L D" -conf { } 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 @@ delay 2 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 {