[master] eb4106e Fix r01684.vtc logexpect handling

[Martin Blix Grydeland]

commit eb4106e385ae0116cea9bd8367b5c1b64e5c80ca
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed Jan 6 17:14:38 2016 +0100

    Fix r01684.vtc logexpect handling
    
    The script lacked a logexpect -wait at the end telling it to actually
    wait for the required log content.
    
    Added a new rule to match first on an actual retry backend transaction
    and match the header set/unset/set tests on that vxid.

diff --git a/bin/varnishtest/tests/r01684.vtc b/bin/varnishtest/tests/r01684.vtc
index f4eb71e..9c2f01f 100644
--- a/bin/varnishtest/tests/r01684.vtc
+++ b/bin/varnishtest/tests/r01684.vtc
@@ -21,10 +21,11 @@ varnish v1 -vcl+backend {
 } -start
 
 # check log for the aborted POST
-logexpect l1 -v v1 {
-	expect * =	BereqHeader "^X-Varnish:"
+logexpect l1 -v v1 -g request {
+	expect * *	Begin		"^bereq .* retry"
+	expect * =	BereqHeader	"^X-Varnish:"
 	expect * =	BereqUnset	"^X-Varnish:"
-	expect * =	BereqHeader	"^X-Varnish"
+	expect * =	BereqHeader	"^X-Varnish:"
 } -start
 
 varnish v1 -cliok "param.set debug +syncvsl"
@@ -35,3 +36,5 @@ client c1 {
 	rxresp
 	expect resp.http.foo == 3
 } -run
+
+logexpect l1 -wait