Commit e6b9b0f1 authored by Nils Goroll's avatar Nils Goroll

try to stabilize e00003.vtc

it seems vtc logexpect raced the client such that logexpect missed
requests which actually exist in the VSL.

So avoid this issue by starting the logexpects with -d 1 after the client has
finished
parent 2bf076fd
......@@ -58,37 +58,6 @@ varnish v1 -arg "-p debug=+syncvsl" -vcl+backend {
}
} -start
logexpect l1 -v v1 -g request {
expect 0 1001 Begin "^req .* rxreq"
# ReqAcct body counts include chunked overhead
expect * = ReqAcct "^29 0 29 187 104 291$"
expect 0 = End
} -start
logexpect l2 -v v1 -g request {
expect * 1002 Begin "^bereq "
expect * = End
} -start
logexpect l3 -v v1 -g request {
expect * 1003 Begin "^req .* esi"
expect * = ReqAcct "^0 0 0 0 18 18$"
expect 0 = End
} -start
logexpect l4 -v v1 -g request {
expect * 1004 Begin "^bereq "
expect * = End
} -start
logexpect l5 -v v1 -g request {
expect * 1005 Begin "^req .* rxreq"
# ReqAcct body counts include chunked overhead
# Header bytes is 5 larger than in l1 due to two item X-Varnish hdr
expect * = ReqAcct "^29 0 29 192 104 296$"
expect 0 = End
} -start
client c1 {
txreq -hdr "Host: foo"
rxresp
......@@ -124,6 +93,37 @@ client c1 {
client c1 -run
varnish v1 -expect esi_errors == 0
logexpect l1 -v v1 -d 1 -g request {
expect 0 1001 Begin "^req .* rxreq"
# ReqAcct body counts include chunked overhead
expect * = ReqAcct "^29 0 29 187 104 291$"
expect 0 = End
} -start
logexpect l2 -v v1 -d 1 -g request {
expect * 1002 Begin "^bereq "
expect * = End
} -start
logexpect l3 -v v1 -d 1 -g request {
expect * 1003 Begin "^req .* esi"
expect * = ReqAcct "^0 0 0 0 18 18$"
expect 0 = End
} -start
logexpect l4 -v v1 -d 1 -g request {
expect * 1004 Begin "^bereq "
expect * = End
} -start
logexpect l5 -v v1 -d 1 -g request {
expect * 1005 Begin "^req .* rxreq"
# ReqAcct body counts include chunked overhead
# Header bytes is 5 larger than in l1 due to two item X-Varnish hdr
expect * = ReqAcct "^29 0 29 192 104 296$"
expect 0 = End
} -start
logexpect l1 -wait
logexpect l2 -wait
logexpect l3 -wait
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment