[4.0] acc49fd Fix test cases to pass with timestamp records present
Martin Blix Grydeland
martin at varnish-software.com
Tue Apr 1 15:09:54 CEST 2014
commit acc49fdda0cbefa8722a4b9ce4975ee516ae7d0b
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date: Tue Mar 25 17:43:48 2014 +0100
Fix test cases to pass with timestamp records present
diff --git a/bin/varnishtest/tests/l00000.vtc b/bin/varnishtest/tests/l00000.vtc
index 09423cc..1c732fc 100644
--- a/bin/varnishtest/tests/l00000.vtc
+++ b/bin/varnishtest/tests/l00000.vtc
@@ -16,14 +16,13 @@ logexpect l1 -v v1 -g session {
expect 0 = End
expect 0 * Begin "req 1000"
- expect 0 = ReqStart
+ expect * = ReqStart
expect 0 = ReqMethod GET
expect 0 = ReqURL /
expect 0 = ReqProtocol HTTP/1.1
expect * = ReqHeader "Foo: bar"
expect * = Link bereq
- expect * = ReqEnd
- expect 0 = End
+ expect * = End
expect 0 1002 Begin "bereq 1001"
expect * = End
diff --git a/bin/varnishtest/tests/l00001.vtc b/bin/varnishtest/tests/l00001.vtc
index a161c7b..b1ec63c 100644
--- a/bin/varnishtest/tests/l00001.vtc
+++ b/bin/varnishtest/tests/l00001.vtc
@@ -22,175 +22,150 @@ client c1 {
# Test 'eq' operator
logexpect l1 -d 1 -g vxid -q "Begin eq 'req 1000 rxreq'" {
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 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '==' operator on integers
logexpect l1 -d 1 -g vxid -q "RespStatus == 200" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '==' operator on floats
logexpect l1 -d 1 -g vxid -q "RespStatus == 200." {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '!=' operator on integers
logexpect l1 -d 1 -g vxid -q "RespStatus != 503" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '!=' operator on floats
logexpect l1 -d 1 -g vxid -q "RespStatus != 503." {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '<' operator on integers
logexpect l1 -d 1 -g vxid -q "RespStatus < 201" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '<' operator on floats
logexpect l1 -d 1 -g vxid -q "RespStatus < 201." {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '>' operator on integers
logexpect l1 -d 1 -g vxid -q "RespStatus > 199" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '>' operator on floats
logexpect l1 -d 1 -g vxid -q "RespStatus > 199." {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '<=' operator on integers
logexpect l1 -d 1 -g vxid -q "RespStatus <= 200" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '<=' operator on floats
logexpect l1 -d 1 -g vxid -q "RespStatus <= 200." {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '>=' operator on integers
logexpect l1 -d 1 -g vxid -q "RespStatus >= 200" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '>=' operator on floats
logexpect l1 -d 1 -g vxid -q "RespStatus >= 200." {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '~' operator
logexpect l1 -d 1 -g vxid -q "RespStatus ~ '^200$'" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test '!~' operator
logexpect l1 -d 1 -g vxid -q "RespStatus !~ '^404$'" {
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 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test boolean or
logexpect l1 -d 1 -g vxid -q "RespStatus == 404 or RespStatus ~ '^200$'" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test boolean not
logexpect l1 -d 1 -g vxid -q "RespStatus == 404 or not RespStatus ~ '^404$'" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test grouping
logexpect l1 -d 1 -g vxid -q "(RespStatus == 200 or RespStatus == 404) and RespStatus == 200" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test and/or precedence
logexpect l1 -d 1 -g vxid -q "RespStatus == 200 or RespStatus == 503 and RespStatus == 404" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test field
logexpect l1 -d 1 -g vxid -q "RespHeader[2] == 123" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test taglists
logexpect l1 -d 1 -g vxid -q "Debug,Resp* == 200" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test record prefix
logexpect l1 -d 1 -g vxid -q "Resp*:x-test eq '123 321'" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
# Test tag presence (no operator)
logexpect l1 -d 1 -g vxid -q "RespStatus" {
expect 0 * Begin req
- expect * = ReqEnd
expect * = End
} -run
More information about the varnish-commit
mailing list