[master] a538048 Try to close a raise in this test where c1's request didn't get processed until after we switched VCL.

[Poul-Henning Kamp]

commit a5380481e586252eed693be28c01bb502b534352
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Jan 13 09:44:19 2017 +0000

    Try to close a raise in this test where c1's request didn't get
    processed until after we switched VCL.
    
    Fixes #2052

diff --git a/bin/varnishtest/tests/d00012.vtc b/bin/varnishtest/tests/d00012.vtc
index 96d4f65..bca1c5b 100644
--- a/bin/varnishtest/tests/d00012.vtc
+++ b/bin/varnishtest/tests/d00012.vtc
@@ -3,11 +3,13 @@ varnishtest "Test a dynamic backend discard during a request"
 # vcl.discard testing inspired by v00006.vtc from commit e1f7207
 
 barrier b1 cond 2
+barrier b2 cond 2
 
 server s1 {
 	rxreq
 	expect req.url == "/foo"
 	barrier b1 sync
+	barrier b2 sync
 	txresp
 } -start
 
@@ -40,6 +42,8 @@ server s2 {
 	txresp
 } -start
 
+barrier b1 sync
+
 varnish v1 -vcl {
 	import debug;
 
@@ -55,7 +59,7 @@ varnish v1 -vcl {
 }
 
 varnish v1 -cli "vcl.discard vcl1"
-barrier b1 sync
+barrier b2 sync
 
 client c1 -wait
 delay 2