REGTESTS: Make the script testing conditional set-var compatible with Vtest2

VTest2 will replaced VTest in few months. There is not so much change
expected. One of them is that a User-Agent header is added by default in all
requests, except if an custom one is already set or if "-nouseragent" option
is used. To still be compatible with VTest, it is not possible to use the
option to avoid the header addition. So, a custom user-agent is added in the
last test of "sample_fetches/cond_set_var.vtc" to be sure it will pass with
Vtest and Vtest2. It is mandatory because the request length is tested.

(cherry picked from commit 82c291124882d75625122e7f81b965fa2853e720)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 90ce6153820b13fdf294f54794ed5a841c7b805c)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

diff --git a/reg-tests/sample_fetches/cond_set_var.vtc b/reg-tests/sample_fetches/cond_set_var.vtc
index 67786ae..2685b89 100644 (file)
--- a/reg-tests/sample_fetches/cond_set_var.vtc
+++ b/reg-tests/sample_fetches/cond_set_var.vtc
@@ -355,8 +355,8 @@ client c9 -connect ${h1_mainfe_sock} {
 } -run
 
 client c10 -connect ${h1_mainfe_sock} {
-    txreq -url "/converter" -hdr "X-Cust: foobar"
+    txreq -url "/converter"  -hdr "User-Agent: c10" -hdr "X-Cust: foobar"
     rxresp
     expect resp.status == 200
-    expect resp.http.x-var == "proc.req_len=67 sess.x_cust=foobar"
+    expect resp.http.x-var == "proc.req_len=80 sess.x_cust=foobar"
 } -run