[master] eac07a5 Improvements as I go through the tests

Federico G. Schwindt fgsch at lodoss.net
Mon Jan 16 14:18:05 CET 2017


commit eac07a58e82c0d3b6353273793fdf6efca56671a
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Jan 16 13:05:39 2017 +0000

    Improvements as I go through the tests

diff --git a/bin/varnishtest/tests/b00030.vtc b/bin/varnishtest/tests/b00030.vtc
index a3fb9cc..5962b40 100644
--- a/bin/varnishtest/tests/b00030.vtc
+++ b/bin/varnishtest/tests/b00030.vtc
@@ -10,7 +10,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv {
-		return (synth(200,req.ttl));
+		return (synth(200));
 	}
 	sub vcl_synth {
 		set resp.http.x-timestamp = now;
@@ -20,5 +20,5 @@ varnish v1 -vcl+backend {
 client c1 {
 	txreq
 	rxresp
-	expect resp.reason == "-1.000"
+	expect resp.http.x-timestamp ~ "..., .. ... .... ..:..:.. GMT"
 } -run
diff --git a/bin/varnishtest/tests/b00036.vtc b/bin/varnishtest/tests/b00036.vtc
index c07fe86..97902ec 100644
--- a/bin/varnishtest/tests/b00036.vtc
+++ b/bin/varnishtest/tests/b00036.vtc
@@ -27,9 +27,7 @@ client c1 {
 	txreq -req PURGE
 	rxresp
 	expect resp.reason == "Purged"
-} -run
 
-client c1 {
 	txreq
 	rxresp
 	expect resp.http.foo == 2
diff --git a/bin/varnishtest/tests/b00040.vtc b/bin/varnishtest/tests/b00040.vtc
index 123c3a1..228aaa9 100644
--- a/bin/varnishtest/tests/b00040.vtc
+++ b/bin/varnishtest/tests/b00040.vtc
@@ -1,4 +1,4 @@
-varnishtest "test certain mailformed reqests"
+varnishtest "test certain mailformed requests"
 
 server s1 {
 	rxreq
diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc
index 5f36a6c..e76e2cb 100644
--- a/bin/varnishtest/tests/v00020.vtc
+++ b/bin/varnishtest/tests/v00020.vtc
@@ -78,22 +78,32 @@ varnish v1 -vcl {
 
 		set req.http.foo = now - now;
 
-		set req.http.foo = 1- -1;
-
 		set req.http.foo = 1 + 1;
 		set req.http.foo = 1 - 1;
+		set req.http.foo = 1 + -1;
+		set req.http.foo = 1 - -1;
 		set req.http.foo = 3 * 2;
 		set req.http.foo = 3 / 2;
+		set req.http.foo = 3 * -2;
+		set req.http.foo = 3 / -2;
 
 		set req.http.foo = 3.6 + 1.4;
 		set req.http.foo = 3.6 - 1.4;
+		set req.http.foo = 3.6 + -1.4;
+		set req.http.foo = 3.6 - -1.4;
 		set req.http.foo = 3.6 * 1.4;
 		set req.http.foo = 3.6 / 1.4;
+		set req.http.foo = 3.6 * -1.4;
+		set req.http.foo = 3.6 / -1.4;
 
 		set req.http.foo = 1.0 + 1;
 		set req.http.foo = 1.0 - 1;
+		set req.http.foo = 1.0 + -1;
+		set req.http.foo = 1.0 - -1;
 		set req.http.foo = 3.0 * 2;
 		set req.http.foo = 3.0 / 2;
+		set req.http.foo = 3.0 * -2;
+		set req.http.foo = 3.0 / -2;
 
 		set req.http.foo = req.http.foo + "bar" ~ "bar";
 		set req.http.foo = req.http.foo + "bar" !~ "bar";



More information about the varnish-commit mailing list