[master] f82d3b5a3 Don't launch varnishncsa to test VSL records, we have logexpect.

Poul-Henning Kamp phk at FreeBSD.org
Tue Sep 29 13:58:07 UTC 2020


commit f82d3b5a3fcb5f773782632f075d031be1b8d0fc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 29 13:57:13 2020 +0000

    Don't launch varnishncsa to test VSL records, we have logexpect.

diff --git a/bin/varnishtest/tests/t02015.vtc b/bin/varnishtest/tests/t02015.vtc
index dc9431b3e..4dc6dec63 100644
--- a/bin/varnishtest/tests/t02015.vtc
+++ b/bin/varnishtest/tests/t02015.vtc
@@ -8,6 +8,11 @@ server s1 {
 varnish v1 -cliok "param.set feature +http2"
 varnish v1 -vcl+backend "" -start
 
+logexpect l1 -v v1 -g request {
+	expect * 1001	ReqAcct "46 0 46 97 12345 12442"
+	expect * 1003	ReqAcct "46 0 46 102 1000 1102"
+} -start
+
 client c1 {
 	txpri
 
@@ -36,14 +41,4 @@ client c1 {
 	} -run
 } -run
 
-varnish v1 -vsl_catchup
-
-shell -match "^12345$" {
-	varnishncsa -n ${v1_name} -F '%{VSL:ReqAcct[5]}x' -d \
-		-q 'ReqHeader:stream == 1'
-}
-
-shell -match "^1000$" {
-	varnishncsa -n ${v1_name} -F '%{VSL:ReqAcct[5]}x' -d \
-		-q 'ReqHeader:stream == 3'
-}
+logexpect l1 -wait


More information about the varnish-commit mailing list