[master] 93e58f1 Fix test cases after Begin and Link changes

[Martin Blix Grydeland]

commit 93e58f110be7066491f7337ab7c8a45891b47b17
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed Jan 8 15:12:38 2014 +0100

    Fix test cases after Begin and Link changes

diff --git a/bin/varnishtest/tests/l00000.vtc b/bin/varnishtest/tests/l00000.vtc
index adf7c8f..c4dd3f1 100644
--- a/bin/varnishtest/tests/l00000.vtc
+++ b/bin/varnishtest/tests/l00000.vtc
@@ -16,10 +16,10 @@ logexpect l1 -v v1 -g session {
 	expect 0 =	End
 
 	expect 0 *	Begin		"req 1000"
-	expect 0 =	ReqMethod		GET
+	expect 0 =	ReqMethod	GET
 	expect 0 =	ReqURL		/
 	expect 0 =	ReqProtocol	HTTP/1.1
-	expect * =	ReqHeader		"Foo: bar"
+	expect * =	ReqHeader	"Foo: bar"
 	expect * =	Link		bereq
 	expect * =	ReqEnd
 	expect 0 =	End
@@ -29,7 +29,7 @@ logexpect l1 -v v1 -g session {
 } -start
 
 # Check with a query (this selects only the backend request)
-logexpect l2 -v v1 -g vxid -q "Begin eq 'bereq 1001'" {
+logexpect l2 -v v1 -g vxid -q "Begin ~ 'bereq 1001'" {
 	expect 0 1002	Begin
 	expect * =	End
 } -start
diff --git a/bin/varnishtest/tests/l00001.vtc b/bin/varnishtest/tests/l00001.vtc
index 1da61df..a161c7b 100644
--- a/bin/varnishtest/tests/l00001.vtc
+++ b/bin/varnishtest/tests/l00001.vtc
@@ -20,7 +20,7 @@ client c1 {
 } -run
 
 # Test 'eq' operator
-logexpect l1 -d 1 -g vxid -q "Begin eq 'req 1000'" {
+logexpect l1 -d 1 -g vxid -q "Begin eq 'req 1000 rxreq'" {
 	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End