[prev in list] [next in list] [prev in thread] [next in thread] 

List:       varnish-commit
Subject:    [master] d81611cc6 test in more detail how a pipe transaction looks like
From:       Nils Goroll <nils.goroll () uplex ! de>
Date:       2020-12-07 17:43:07
Message-ID: 20201207174307.B95A5513D () lists ! varnish-cache ! org
[Download RAW message or body]


commit d81611cc62f576105524185fcfcef261cf69a1ca
Author: Nils Goroll <nils.goroll@uplex.de>
Date:   Mon Dec 7 18:41:28 2020 +0100

    test in more detail how a pipe transaction looks like
    
    Ref #3470

diff --git a/bin/varnishtest/tests/v00051.vtc b/bin/varnishtest/tests/v00051.vtc
index a12d23ade..dca168794 100644
--- a/bin/varnishtest/tests/v00051.vtc
+++ b/bin/varnishtest/tests/v00051.vtc
@@ -148,10 +148,21 @@ varnish v1 -vcl+backend {
 }
 
 
-logexpect l1 -v v1 -g raw {
-	expect * 1012	VCL_call	"PIPE"
-	expect 0 1012	VCL_Error	"Forced failure"
-	expect 0 1012	VCL_return	"fail"
+logexpect l2 -v v1 -g vxid -q "vxid == 1012" {
+	expect 0 1012	Begin		{^bereq 1011 pipe}
+	expect 0 =	BereqMethod	{^GET}
+	expect 0 =	BereqURL	{^/}
+	expect 0 =	BereqProtocol	{^HTTP/1.1}
+	expect 0 =	BereqHeader	{^foo: pipe}
+	expect 0 =	BereqHeader	{^Host: }
+	expect 0 =	BereqHeader	{^X-Forwarded-For: }
+	expect 0 =	BereqHeader	{^X-Varnish: 1011}
+	expect 0 =	BereqHeader	{^Connection: close}
+	expect 0 =	VCL_call	{^PIPE}
+	expect 0 =	VCL_Error	{^Forced failure}
+	expect 0 =	VCL_return	{^fail}
+	expect 0 =	BereqAcct	{^0 0 0 0 0 0}
+	expect 0 =	End
 } -start
 
 client c1 {
@@ -164,7 +175,7 @@ client c1 {
 varnish v1 -expect vcl_fail == 5
 varnish v1 -expect sc_vcl_failure == 5
 
-logexpect l1 -wait
+logexpect l2 -wait
 
 #######################################################################
 # Fail in vcl_pass, no handling in vcl_synth
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
[prev in list] [next in list] [prev in thread] [next in thread]