[master] 0ec0747ad stabilize test

Nils Goroll nils.goroll at uplex.de
Fri Mar 13 10:51:05 UTC 2020


commit 0ec0747ad943d2b9c5710ad6915ad623fa5bb66f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Mar 13 11:49:15 2020 +0100

    stabilize test
    
    have seen this failing on Travis with:
    
    **** v1   vsl|       1004 VCL_call        b BACKEND_FETCH
    **** v1   vsl|       1004 VCL_return      b abandon
    **** v1   vsl|       1004 BereqAcct       b 0 0 0 0 0 0
    
    Tested ok locally with varnishtest -n 1000 -j 60.

diff --git a/bin/varnishtest/tests/d00036.vtc b/bin/varnishtest/tests/d00036.vtc
index b75278b44..d21646bf8 100644
--- a/bin/varnishtest/tests/d00036.vtc
+++ b/bin/varnishtest/tests/d00036.vtc
@@ -1,6 +1,6 @@
 varnishtest "Test dynamic UDS backend hot swap after it was picked by a bereq"
 
-barrier b1 cond 2
+barrier b1 sock 2
 
 server s1 -listen "${tmpdir}/s1.sock" {
 } -start
@@ -30,8 +30,8 @@ varnish v1 -vcl {
 
 	sub vcl_backend_fetch {
 		set bereq.backend = s1.backend();
-		# hot swap should happen while we sleep
-		vtc.sleep(2s);
+		# hot swap has happened
+		vtc.barrier_sync("${b1_sock}");
 		if (std.healthy(bereq.backend)) {
 			return(abandon);
 		} else {
@@ -44,17 +44,16 @@ varnish v1 -expect MAIN.n_backend == 1
 
 client c1 {
 	txreq
-	barrier b1 sync
 	rxresp
 	expect resp.status == 200
 }
 
 client c2 {
-	barrier b1 sync
 	delay 0.1
 	txreq -req "SWAP" -hdr "X-Path: ${s2_sock}"
 	rxresp
 	expect resp.status == 200
+	barrier b1 sync
 }
 
 client c1 -start


More information about the varnish-commit mailing list