[master] 9367d8003 fix logexpect syntax in some vtcs
Nils Goroll
nils.goroll at uplex.de
Mon Sep 3 13:58:11 UTC 2018
commit 9367d8003c26955d6fefbaba290a4de141802290
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Mon Sep 3 15:55:38 2018 +0200
fix logexpect syntax in some vtcs
The syntax is
expect <skip> <vxid> <tag> <regex>
Also remove some bogus .*$ from regexen (waving to @slimhazard)
diff --git a/bin/varnishtest/tests/c00011.vtc b/bin/varnishtest/tests/c00011.vtc
index 24622675f..907355f2f 100644
--- a/bin/varnishtest/tests/c00011.vtc
+++ b/bin/varnishtest/tests/c00011.vtc
@@ -23,7 +23,7 @@ varnish v1 -vcl+backend {
} -start
logexpect l1 -v v1 -g vxid {
- expect 1003 * HitMiss "^1002 119.*$"
+ expect * 1003 HitMiss "^1002 119"
} -start
client c1 {
diff --git a/bin/varnishtest/tests/c00081.vtc b/bin/varnishtest/tests/c00081.vtc
index 5b7c55166..b08fa3250 100644
--- a/bin/varnishtest/tests/c00081.vtc
+++ b/bin/varnishtest/tests/c00081.vtc
@@ -30,7 +30,7 @@ varnish v1 -vcl+backend {
} -start
logexpect l1 -v v1 -g vxid {
- expect 1003 * HitPass "^1002 1.*$"
+ expect * 1003 HitPass "^1002 1"
} -start
client c1 {
diff --git a/bin/varnishtest/tests/r01858.vtc b/bin/varnishtest/tests/r01858.vtc
index fe1cbe1de..1fb787f76 100644
--- a/bin/varnishtest/tests/r01858.vtc
+++ b/bin/varnishtest/tests/r01858.vtc
@@ -24,7 +24,7 @@ varnish v1 -vcl+backend {
# Tests logging hit-for-miss on an expired object
logexpect l1 -v v1 -g vxid {
- expect 1003 * HitMiss "^1002 -.*$"
+ expect * 1003 HitMiss "^1002 -"
} -start
client c1 {
More information about the varnish-commit
mailing list