[master] 7b4e6cb Improve test cases by anchoring the expected lines to the first

Martin Blix Grydeland martin at varnish-cache.org
Tue Oct 1 14:48:18 CEST 2013


commit 7b4e6cbf8f9fd1efb6a7cce667b2e7ed46870989
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Fri Sep 20 16:29:06 2013 +0200

    Improve test cases by anchoring the expected lines to the first

diff --git a/bin/varnishtest/tests/l00001.vtc b/bin/varnishtest/tests/l00001.vtc
index 9b3197d..0de5614 100644
--- a/bin/varnishtest/tests/l00001.vtc
+++ b/bin/varnishtest/tests/l00001.vtc
@@ -18,133 +18,133 @@ client c1 {
 
 # Test 'eq' operator
 logexpect l1 -d 1 -g vxid -q "Begin eq 'req 1000'" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test 'ne' operator
 logexpect l1 -d 1 -g vxid -q "ReqProtocol ne 'HTTP/1.0'" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '==' operator on integers
 logexpect l1 -d 1 -g vxid -q "RespStatus == 200" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '==' operator on floats
 logexpect l1 -d 1 -g vxid -q "RespStatus == 200." {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '!=' operator on integers
 logexpect l1 -d 1 -g vxid -q "RespStatus != 503" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '!=' operator on floats
 logexpect l1 -d 1 -g vxid -q "RespStatus != 503." {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '<' operator on integers
 logexpect l1 -d 1 -g vxid -q "RespStatus < 201" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '<' operator on floats
 logexpect l1 -d 1 -g vxid -q "RespStatus < 201." {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '>' operator on integers
 logexpect l1 -d 1 -g vxid -q "RespStatus > 199" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '>' operator on floats
 logexpect l1 -d 1 -g vxid -q "RespStatus > 199." {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '<=' operator on integers
 logexpect l1 -d 1 -g vxid -q "RespStatus <= 200" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '<=' operator on floats
 logexpect l1 -d 1 -g vxid -q "RespStatus <= 200." {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '>=' operator on integers
 logexpect l1 -d 1 -g vxid -q "RespStatus >= 200" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '>=' operator on floats
 logexpect l1 -d 1 -g vxid -q "RespStatus >= 200." {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '~' operator
 logexpect l1 -d 1 -g vxid -q "RespStatus ~ '^200$'" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test '!~' operator
 logexpect l1 -d 1 -g vxid -q "RespStatus !~ '^404$'" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test boolean and
 logexpect l1 -d 1 -g vxid -q "RespStatus == 200 and RespStatus ~ '^200$'" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test boolean or
 logexpect l1 -d 1 -g vxid -q "RespStatus == 404 or RespStatus ~ '^200$'" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run
 
 # Test boolean !
 logexpect l1 -d 1 -g vxid -q "RespStatus == 404 or !RespStatus ~ '^404$'" {
-	expect * *	Begin	req
+	expect 0 *	Begin	req
 	expect * =	ReqEnd
 	expect * =	End
 } -run



More information about the varnish-commit mailing list