[master] 7d6878c Make the logexpect stuff robust

[Poul-Henning Kamp]

commit 7d6878cf74c41f82ffe99365e7ef517f75924821
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 27 13:44:24 2014 +0000

    Make the logexpect stuff robust

diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index a8ab61a..02e6840 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -32,18 +32,26 @@ logexpect l1 -v v1 -g request {
 	expect 0 1001   Begin   "^req .* rxreq"
 	expect * =	ReqAcct	"^18 0 18 176 75 251$"
 	expect 0 =      End
+} -start
 
-	expect 0 1002   Begin   "^bereq "
+logexpect l2 -v v1 -g request {
+	expect * 1002   Begin   "^bereq "
 	expect * =      End
+} -start
 
-	expect 0 1003   Begin   "^req .* esi"
+logexpect l3 -v v1 -g request {
+	expect * 1003   Begin   "^req .* esi"
 	expect * = 	ReqAcct	"^0 0 0 0 18 18$"
 	expect 0 =      End
+} -start
 
-	expect 0 1004   Begin   "^bereq "
+logexpect l4 -v v1 -g request {
+	expect * 1004   Begin   "^bereq "
 	expect * =      End
+} -start
 
-	expect 0 1005   Begin   "^req .* rxreq"
+logexpect l5 -v v1 -g request {
+	expect * 1005   Begin   "^req .* rxreq"
 	expect * =	ReqAcct	"^18 0 18 181 75 256$"
 	expect 0 =      End
 } -start
@@ -66,3 +74,7 @@ client c1 -run
 varnish v1 -expect esi_errors == 0
 
 logexpect l1 -wait
+logexpect l2 -wait
+logexpect l3 -wait
+logexpect l4 -wait
+logexpect l5 -wait