[master] 0275c1996 vtc: Increase varnishncsa -[bcE] test coverage

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon Jan 18 16:06:08 UTC 2021


commit 0275c19960427eaf757be9bb061f7ee3a40ae259
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Nov 23 13:56:25 2020 +0100

    vtc: Increase varnishncsa -[bcE] test coverage

diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index 1e73e27df..11ba3de74 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -92,6 +92,44 @@ logexpect l3 -wait
 logexpect l4 -wait
 logexpect l5 -wait
 
+shell {
+	varnishncsa -n ${v1_name} -d \
+		-F '%{Varnish:vxid}x %{Varnish:side}x %{VSL:Begin[3]}x' |
+	sort > ncsa.txt
+
+	cat >expected.txt <<-EOF
+	1001 c rxreq
+	1005 c rxreq
+	EOF
+	diff -u expected.txt ncsa.txt
+}
+
+shell {
+	varnishncsa -n ${v1_name} -d -b \
+		-F '%{Varnish:vxid}x %{Varnish:side}x %{VSL:Begin[3]}x' |
+	sort > ncsa.txt
+
+	cat >expected.txt <<-EOF
+	1002 b fetch
+	1004 b fetch
+	EOF
+	diff -u expected.txt ncsa.txt
+}
+
+shell {
+	varnishncsa -n ${v1_name} -d -E \
+		-F '%{Varnish:vxid}x %{Varnish:side}x %{VSL:Begin[3]}x' |
+	sort > ncsa.txt
+
+	cat >expected.txt <<-EOF
+	1001 c rxreq
+	1003 c esi
+	1005 c rxreq
+	1006 c esi
+	EOF
+	diff -u expected.txt ncsa.txt
+}
+
 shell {
 	varnishncsa -n ${v1_name} -d -b -E \
 		-F '%{Varnish:vxid}x %{Varnish:side}x %{VSL:Begin[3]}x' |
diff --git a/bin/varnishtest/tests/u00003.vtc b/bin/varnishtest/tests/u00003.vtc
index 1191f085f..ae81e664c 100644
--- a/bin/varnishtest/tests/u00003.vtc
+++ b/bin/varnishtest/tests/u00003.vtc
@@ -159,3 +159,5 @@ process p2 {varnishncsa -t 5 -n nonexistent} -start
 delay 1
 process p2 -expect-exit 1 -kill INT -wait
 shell {grep -q "VSM: Attach interrupted" ${p2_err}}
+
+# ESI coverage in e00003.vtc
diff --git a/bin/varnishtest/tests/u00006.vtc b/bin/varnishtest/tests/u00006.vtc
index aef71d393..c331d7ddf 100644
--- a/bin/varnishtest/tests/u00006.vtc
+++ b/bin/varnishtest/tests/u00006.vtc
@@ -164,3 +164,5 @@ shell -err -expect "Cannot open ${tmpdir}/foo: " \
 shell "echo foobar > ${tmpdir}/foo"
 shell -err -expect "Not a VSL file: ${tmpdir}/foo" \
 	"varnishlog -r ${tmpdir}/foo"
+
+# ESI coverage in e00003.vtc


More information about the varnish-commit mailing list