[master] 12610fd More coverage

[Federico G. Schwindt]

commit 12610fd5f70185141d92c47ecf3cbd19375a7dcc
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Apr 16 22:17:25 2018 +0100

    More coverage

diff --git a/bin/varnishtest/tests/m00014.vtc b/bin/varnishtest/tests/m00014.vtc
index 6d60def..f3272a6 100644
--- a/bin/varnishtest/tests/m00014.vtc
+++ b/bin/varnishtest/tests/m00014.vtc
@@ -9,40 +9,50 @@ varnish v1 -vcl+backend {
 	import std;
 
 	sub vcl_deliver {
-		set resp.http.url = std.querysort(req.url);
+		set resp.http.url = std.querysort(req.http.url);
 	}
 } -start
 
 client c1 {
-	txreq -url "/foo/bar?t=0&b=0&p=0&c=5"
+	txreq -hdr "url: /foo/bar?t=0&b=0&p=0&c=5"
 	rxresp
 	expect resp.http.url == "/foo/bar?b=0&c=5&p=0&t=0"
 
 	delay .1
 
-	txreq -url "/foo/bar?coa=0&co=0"
+	txreq -hdr "url: /foo/bar?coa=0&co=0"
 	rxresp
 	expect resp.http.url == "/foo/bar?co=0&coa=0"
 
 	delay .1
 
-	txreq -url "/foo/bar?a=0&&&&&"
+	txreq -hdr "url: /foo/bar?a=0&&&&&"
 	rxresp
 	expect resp.http.url == "/foo/bar?a=0"
 
-	txreq -url "/foo/bar?&a=0&&&&&z&w&x&"
+	txreq -hdr "url: /foo/bar?&a=0&&&&&z&w&x&"
 	rxresp
 	expect resp.http.url == "/foo/bar?a=0&w&x&z"
 
 	delay .1
 
-	txreq -url "/foo/bar?&"
+	txreq -hdr "url: /foo/bar?&"
 	rxresp
 	expect resp.http.url == "/foo/bar?"
 
 	delay .1
 
-	txreq -url "/foo/bar"
+	txreq -hdr "url: /foo/bar?t=0"
+	rxresp
+	expect resp.http.url == "/foo/bar?t=0"
+
+	delay .1
+
+	txreq -hdr "url: /foo/bar"
 	rxresp
 	expect resp.http.url == "/foo/bar"
+
+	txreq
+	rxresp
+	expect resp.http.url == ""
 } -run
diff --git a/bin/varnishtest/tests/m00018.vtc b/bin/varnishtest/tests/m00018.vtc
index 33d68f3..f41faf2 100644
--- a/bin/varnishtest/tests/m00018.vtc
+++ b/bin/varnishtest/tests/m00018.vtc
@@ -1,6 +1,6 @@
 varnishtest "Test std.substr"
 
-server s1 -repeat 2 {
+server s1 {
 	rxreq
 	txresp
 } -start
@@ -9,16 +9,16 @@ varnish v1 -vcl+backend {
 	import std;
 
 	sub vcl_deliver {
-		set resp.http.sub = std.strstr(req.url, "b");
+		set resp.http.sub1 = std.strstr(req.http.one, "b");
+		set resp.http.sub2 = std.strstr(req.http.two, "b");
+		set resp.http.sub3 = std.strstr(req.http.unset, "b");
 	}
 } -start
 
 client c1 {
-	txreq -url "/foobar"
+	txreq -hdr "one: foobar" -hdr "two: quux"
 	rxresp
-	expect resp.http.sub == "bar"
-
-	txreq -url "/quux"
-	rxresp
-	expect resp.http.sub == ""
+	expect resp.http.sub1 == "bar"
+	expect resp.http.sub2 == ""
+	expect resp.http.sub3 == ""
 } -run
diff --git a/bin/varnishtest/tests/m00020.vtc b/bin/varnishtest/tests/m00020.vtc
index 8fe5c83..eb2eb0f 100644
--- a/bin/varnishtest/tests/m00020.vtc
+++ b/bin/varnishtest/tests/m00020.vtc
@@ -127,4 +127,7 @@ client c1 {
 	expect resp.http.x-date != "Wed, 29 Feb 2012 00:00:00 GMT"
 	delay .1
 
+	txreq
+	rxresp
+	expect resp.http.x-date != <undef>
 } -run
diff --git a/bin/varnishtest/tests/m00026.vtc b/bin/varnishtest/tests/m00026.vtc
index 8c5f717..3659eb3 100644
--- a/bin/varnishtest/tests/m00026.vtc
+++ b/bin/varnishtest/tests/m00026.vtc
@@ -11,6 +11,7 @@ varnish v1 -vcl {
 
 	sub vcl_synth {
 		set resp.http.X-PATH = std.getenv("PATH");
+		set resp.http.X-unset = std.getenv(req.http.unset);
 	}
 } -start
 
@@ -18,4 +19,5 @@ client c1 {
 	txreq
 	rxresp
 	expect resp.http.X-PATH ~ "^/"
+	expect resp.http.X-unset == ""
 } -run