[master] 34737e22e Stabilise test cases

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon Aug 30 08:31:08 UTC 2021


commit 34737e22e43b50379e0ad0bca47de51631c0ef0c
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Jun 22 11:49:39 2021 +0200

    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.

diff --git a/bin/varnishtest/tests/r02679.vtc b/bin/varnishtest/tests/r02679.vtc
index d1284e2f5..590dfb264 100644
--- a/bin/varnishtest/tests/r02679.vtc
+++ b/bin/varnishtest/tests/r02679.vtc
@@ -22,7 +22,6 @@ client c1 {
 	stream 1 {
 		txreq -req POST -hdr "content-length" "31469" -nostrend
 		txdata -datalen 1550 -nostrend
-		rxwinup
 		txdata -datalen 16000 -nostrend
 		txdata -datalen 13919
 		rxresp
diff --git a/bin/varnishtest/tests/t02014.vtc b/bin/varnishtest/tests/t02014.vtc
index e73477311..f47eed657 100644
--- a/bin/varnishtest/tests/t02014.vtc
+++ b/bin/varnishtest/tests/t02014.vtc
@@ -2,7 +2,13 @@ varnishtest "Exercise h/2 sender flow control code"
 
 barrier b1 sock 3 -cyclic
 
-server s1 -repeat 2 {
+server s1 {
+	rxreq
+	txresp -bodylen 66300
+} -start
+
+server s2 {
+	non_fatal
 	rxreq
 	txresp -bodylen 66300
 } -start
@@ -10,6 +16,12 @@ server s1 -repeat 2 {
 varnish v1 -vcl+backend {
 	import vtc;
 
+	sub vcl_backend_fetch {
+		if (bereq.method == "POST") {
+			set bereq.backend = s2;
+		}
+	}
+
 	sub vcl_deliver {
 		vtc.barrier_sync("${b1_sock}");
 	}
@@ -47,7 +59,7 @@ client c1 {
 	stream 0 -wait
 } -run
 
-client c1 {
+client c2 {
 	stream 0 {
 		barrier b1 sync
 	} -start
@@ -63,7 +75,7 @@ client c1 {
 	stream 0 -wait
 } -run
 
-client c1 {
+client c3 {
 	stream 0 {
 		barrier b1 sync
 		barrier b1 sync
@@ -79,7 +91,6 @@ client c1 {
 	stream 1 {
 		txreq -req "POST" -nostrend
 		txdata -data "ok"
-		rxwinup
 		txdata -data "fail"
 		rxrst
 		expect rst.err == STREAM_CLOSED


More information about the varnish-commit mailing list