[master] 3e6e584b5 Try to stabilize this test

Nils Goroll nils.goroll at uplex.de
Tue Apr 23 13:25:08 UTC 2019


commit 3e6e584b5ff587bf176b375171565bb86819c6f8
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Apr 23 15:22:38 2019 +0200

    Try to stabilize this test
    
    I ignored this for ages, but now it really bothers me: This test had
    quite a high failure rate on systems I control. And actually I do not
    quite understand why the fix works, but it does survive -j100 -n1000
    
    Additional input welcome

diff --git a/bin/varnishtest/tests/r01490.vtc b/bin/varnishtest/tests/r01490.vtc
index 88c2550aa..37310cc55 100644
--- a/bin/varnishtest/tests/r01490.vtc
+++ b/bin/varnishtest/tests/r01490.vtc
@@ -6,8 +6,8 @@ server s1 {
 varnish v1 \
 	-arg "-p debug=+syncvsl" \
 	-arg "-p vsl_mask=+WorkThread" \
-	-arg "-p thread_pool_min=2" \
-	-arg "-p thread_pool_max=3" \
+	-arg "-p thread_pool_min=3" \
+	-arg "-p thread_pool_max=4" \
 	-arg "-p thread_pools=1" \
 	-arg "-p thread_pool_timeout=10" \
 	-vcl+backend {}
@@ -15,19 +15,19 @@ varnish v1 -start
 
 delay 2
 
-varnish v1 -expect threads == 2
+varnish v1 -expect threads == 3
 
 logexpect l1 -v v1 -g raw {
 	expect * 0 WorkThread {^\S+ start$}
 	expect * 0 WorkThread {^\S+ end$}
 } -start
 
-varnish v1 -cliok "param.set thread_pool_min 3"
+varnish v1 -cliok "param.set thread_pool_min 4"
 
 # Have to wait longer than thread_pool_timeout
 delay 11
 
-varnish v1 -expect threads == 3
+varnish v1 -expect threads == 4
 
 varnish v1 -cliok "param.set thread_pool_min 2"
 varnish v1 -cliok "param.set thread_pool_max 2"


More information about the varnish-commit mailing list