Commit 34737e22 authored by Martin Blix Grydeland's avatar Martin Blix Grydeland Committed by Dridi Boukelmoune

Stabilise test cases

With the new request body data handling, Varnish changes behaviour
significantly wrt to stream window updates sent to the client. Window
updates will only be sent once the data is consumed by the client through
the request body VFP handling. Test cases that rely on receiving a window
update to sync the H/2 stream needs to be adopted.
parent 72854910
...@@ -22,7 +22,6 @@ client c1 { ...@@ -22,7 +22,6 @@ client c1 {
stream 1 { stream 1 {
txreq -req POST -hdr "content-length" "31469" -nostrend txreq -req POST -hdr "content-length" "31469" -nostrend
txdata -datalen 1550 -nostrend txdata -datalen 1550 -nostrend
rxwinup
txdata -datalen 16000 -nostrend txdata -datalen 16000 -nostrend
txdata -datalen 13919 txdata -datalen 13919
rxresp rxresp
......
...@@ -2,7 +2,13 @@ varnishtest "Exercise h/2 sender flow control code" ...@@ -2,7 +2,13 @@ varnishtest "Exercise h/2 sender flow control code"
barrier b1 sock 3 -cyclic barrier b1 sock 3 -cyclic
server s1 -repeat 2 { server s1 {
rxreq
txresp -bodylen 66300
} -start
server s2 {
non_fatal
rxreq rxreq
txresp -bodylen 66300 txresp -bodylen 66300
} -start } -start
...@@ -10,6 +16,12 @@ server s1 -repeat 2 { ...@@ -10,6 +16,12 @@ server s1 -repeat 2 {
varnish v1 -vcl+backend { varnish v1 -vcl+backend {
import vtc; import vtc;
sub vcl_backend_fetch {
if (bereq.method == "POST") {
set bereq.backend = s2;
}
}
sub vcl_deliver { sub vcl_deliver {
vtc.barrier_sync("${b1_sock}"); vtc.barrier_sync("${b1_sock}");
} }
...@@ -47,7 +59,7 @@ client c1 { ...@@ -47,7 +59,7 @@ client c1 {
stream 0 -wait stream 0 -wait
} -run } -run
client c1 { client c2 {
stream 0 { stream 0 {
barrier b1 sync barrier b1 sync
} -start } -start
...@@ -63,7 +75,7 @@ client c1 { ...@@ -63,7 +75,7 @@ client c1 {
stream 0 -wait stream 0 -wait
} -run } -run
client c1 { client c3 {
stream 0 { stream 0 {
barrier b1 sync barrier b1 sync
barrier b1 sync barrier b1 sync
...@@ -79,7 +91,6 @@ client c1 { ...@@ -79,7 +91,6 @@ client c1 {
stream 1 { stream 1 {
txreq -req "POST" -nostrend txreq -req "POST" -nostrend
txdata -data "ok" txdata -data "ok"
rxwinup
txdata -data "fail" txdata -data "fail"
rxrst rxrst
expect rst.err == STREAM_CLOSED expect rst.err == STREAM_CLOSED
......
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