[master] e6be754f0 White space OCD
Poul-Henning Kamp
phk at FreeBSD.org
Wed Oct 7 20:25:06 UTC 2020
commit e6be754f021f2448ef3fe5356050e016af4a0558
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Oct 7 20:23:51 2020 +0000
White space OCD
diff --git a/bin/varnishtest/tests/c00016.vtc b/bin/varnishtest/tests/c00016.vtc
index 8cbbfc79d..fa86a59bf 100644
--- a/bin/varnishtest/tests/c00016.vtc
+++ b/bin/varnishtest/tests/c00016.vtc
@@ -57,7 +57,7 @@ varnish v1 -vcl+backend {
sub vcl_deliver {
set resp.http.foo = resp.http.foox;
}
-}
+}
client c1 {
txreq -hdr "Baax: 1" -hdr "Baax: 2" -hdr "Connection: baax"
diff --git a/bin/varnishtest/tests/d00021.vtc b/bin/varnishtest/tests/d00021.vtc
index ee85ace22..e691def28 100644
--- a/bin/varnishtest/tests/d00021.vtc
+++ b/bin/varnishtest/tests/d00021.vtc
@@ -88,9 +88,9 @@ varnish v1 -vcl+backend {
sub vcl_backend_fetch {
if (bereq.http.layered) {
call backend_fetch_layered;
- } else if (bereq.http.resolve) {
- call backend_fetch_layered;
- set bereq.backend = bereq.backend.resolve();
+ } else if (bereq.http.resolve) {
+ call backend_fetch_layered;
+ set bereq.backend = bereq.backend.resolve();
} else {
call backend_fetch_direct;
}
diff --git a/bin/varnishtest/tests/h00007.vtc b/bin/varnishtest/tests/h00007.vtc
index 237c45cae..fa42fcb8f 100644
--- a/bin/varnishtest/tests/h00007.vtc
+++ b/bin/varnishtest/tests/h00007.vtc
@@ -45,7 +45,7 @@ varnish v1 -vcl+backend {
set resp.http.notstdip =
std.ip("" + client.ip, resolve = false) !~ localhost;
}
-}
+}
client c1 -connect ${h1_fe1_sock} {
txreq -url "/"
diff --git a/bin/varnishtest/tests/p00010.vtc b/bin/varnishtest/tests/p00010.vtc
index 1a5a8a25d..67dc4447e 100644
--- a/bin/varnishtest/tests/p00010.vtc
+++ b/bin/varnishtest/tests/p00010.vtc
@@ -72,7 +72,7 @@ client c1 {
txreq -hdr "x-vtc-response-code: 451"
rxresp
expect resp.reason == "Unavailable For Legal Reasons"
-
+
txreq -hdr "x-vtc-response-code: 506"
rxresp
expect resp.reason == "Variant Also Negotiates"
diff --git a/bin/varnishtest/tests/r03169.vtc b/bin/varnishtest/tests/r03169.vtc
index 650b15c83..9127475ab 100644
--- a/bin/varnishtest/tests/r03169.vtc
+++ b/bin/varnishtest/tests/r03169.vtc
@@ -21,9 +21,9 @@ server s1 {
varnish v1 -vcl+backend {
sub vcl_backend_response {
- set beresp.ttl = 1s;
- set beresp.grace = 0s;
- set beresp.keep = 1d;
+ set beresp.ttl = 1s;
+ set beresp.grace = 0s;
+ set beresp.keep = 1d;
}
} -start
@@ -58,4 +58,4 @@ client c1 {
expect resp.status == 200
expect resp.http.ETag == {"bar"}
expect resp.http.Content-Encoding == "gzip"
-} -run
\ No newline at end of file
+} -run
diff --git a/bin/varnishtest/tests/r3354.vtc b/bin/varnishtest/tests/r03354.vtc
similarity index 100%
rename from bin/varnishtest/tests/r3354.vtc
rename to bin/varnishtest/tests/r03354.vtc
diff --git a/bin/varnishtest/tests/r03360.vtc b/bin/varnishtest/tests/r03360.vtc
index 842988119..72668ff9b 100644
--- a/bin/varnishtest/tests/r03360.vtc
+++ b/bin/varnishtest/tests/r03360.vtc
@@ -7,9 +7,9 @@ shell {echo include '"_recurse1.vcl";' > ${tmpdir}/_recurse2.vcl}
varnish v1 -arg "-p vcl_path=${tmpdir}" -errvcl "Recursive include of" {
backend b { .host = "127.0.0.1"; }
include "_recurse.vcl" ;
-}
+}
varnish v2 -arg "-p vcl_path=${tmpdir}" -errvcl "Recursive include of" {
backend b { .host = "127.0.0.1"; }
include "_recurse1.vcl" ;
-}
+}
diff --git a/bin/varnishtest/tests/v00064.vtc b/bin/varnishtest/tests/v00064.vtc
index 080029b4d..19544d686 100644
--- a/bin/varnishtest/tests/v00064.vtc
+++ b/bin/varnishtest/tests/v00064.vtc
@@ -22,11 +22,11 @@ varnish v1 \
-syntax 4.0 \
-vcl+backend {
sub vcl_backend_response {
- if (bereq.url == "/transient") {
- set beresp.storage = storage.Transient;
- # Unset Date header to not change the object sizes
- unset beresp.http.Date;
- }
+ if (bereq.url == "/transient") {
+ set beresp.storage = storage.Transient;
+ # Unset Date header to not change the object sizes
+ unset beresp.http.Date;
+ }
}
} -start
More information about the varnish-commit
mailing list