[master] a9af17c9c Stabilize this test on CentOs

Poul-Henning Kamp phk at FreeBSD.org
Tue Aug 31 07:36:05 UTC 2021


commit a9af17c9c715722f51eb0c5461cf4c229c6bade1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 31 07:35:25 2021 +0000

    Stabilize this test on CentOs

diff --git a/bin/varnishtest/tests/c00105.vtc b/bin/varnishtest/tests/c00105.vtc
index ebe558be5..1c6005900 100644
--- a/bin/varnishtest/tests/c00105.vtc
+++ b/bin/varnishtest/tests/c00105.vtc
@@ -1,8 +1,7 @@
 varnishtest "Failed post-streaming revalidation"
 
-barrier b1 cond 2
+barrier b1 cond 3
 barrier b2 sock 2
-barrier b3 sock 2
 
 server s1 {
 	rxreq
@@ -20,7 +19,6 @@ server s2 {
 varnish v1 -cliok "param.set vsl_mask +ExpKill"
 
 varnish v1 -vcl+backend {
-	import directors;
 	import vtc;
 
 	sub vcl_recv {
@@ -32,7 +30,6 @@ varnish v1 -vcl+backend {
 	sub vcl_backend_response {
 		if (beresp.was_304) {
 			vtc.barrier_sync("${b2_sock}");
-			vtc.barrier_sync("${b3_sock}");
 		}
 		set beresp.ttl = 1ms;
 	}
@@ -46,20 +43,21 @@ client c1 {
 	txreq -hdr "backend: s1"
 	rxresphdrs
 	expect resp.status == 200
+	barrier b1 sync
 	expect_close
 } -start
 
-barrier b1 sync
-
 logexpect l1 -wait
 
+varnish v1 -vsl_catchup
+
+barrier b1 sync
+
 client c2 {
 	txreq -hdr "backend: s2"
 	rxresphdrs
 	expect resp.status == 200
 	expect_close
-} -start
+} -run
 
 client c1 -wait
-barrier b3 sync
-client c2 -wait


More information about the varnish-commit mailing list