[master] 764f1fcad Refer to VCL subs as subroutines in the test suite

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon Dec 23 09:49:06 UTC 2019


commit 764f1fcade4a2b876d2aea9b5b590d5a094681b1
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Dec 23 10:42:35 2019 +0100

    Refer to VCL subs as subroutines in the test suite
    
    Except in r02275.vtc until the code it refers to stops referring to
    subroutines as methods. While I was searching for relevant tests cases
    I also broke some long lines.
    
    Refs 17457b480a25

diff --git a/bin/varnishtest/tests/r02351.vtc b/bin/varnishtest/tests/r02351.vtc
index d2ee19af8..09d12e541 100644
--- a/bin/varnishtest/tests/r02351.vtc
+++ b/bin/varnishtest/tests/r02351.vtc
@@ -19,21 +19,25 @@ client c1 {
 
 	# missing :path
 	stream 3 {
-		txreq -noadd -hdr ":authority" "example.com"  -hdr ":method" "GET" -hdr ":scheme" "http"
+		txreq -noadd -hdr ":authority" "example.com" \
+		    -hdr ":method" "GET" -hdr ":scheme" "http"
 		rxrst
 		expect rst.err == PROTOCOL_ERROR
 	} -run
 
 	# missing :method
 	stream 5 {
-		txreq -noadd -hdr ":authority" "example.com"  -hdr ":path" "/foo" -hdr ":scheme" "http"
+		txreq -noadd -hdr ":authority" "example.com" \
+		    -hdr ":path" "/foo" -hdr ":scheme" "http"
 		rxrst
 		expect rst.err == PROTOCOL_ERROR
 	} -run
 
 	# Duplicate :path
 	stream 7 {
-		txreq -noadd -hdr ":path" "/" -hdr ":path" "/foo" -hdr ":method" "GET" -hdr ":authority" "example.com" -hdr ":scheme" "http"
+		txreq -noadd -hdr ":path" "/" -hdr ":path" "/foo" \
+		    -hdr ":method" "GET" -hdr ":authority" "example.com" \
+		    -hdr ":scheme" "http"
 		rxrst
 		expect rst.err == PROTOCOL_ERROR
 	} -run
diff --git a/bin/varnishtest/tests/v00015.vtc b/bin/varnishtest/tests/v00015.vtc
index 1838a0838..3cb925de6 100644
--- a/bin/varnishtest/tests/v00015.vtc
+++ b/bin/varnishtest/tests/v00015.vtc
@@ -1,4 +1,4 @@
-varnishtest "Check function calls with no action return"
+varnishtest "Check subroutine calls with no action return"
 
 server s1 {
 	rxreq


More information about the varnish-commit mailing list