Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
2eddf20c
Commit
2eddf20c
authored
Feb 05, 2014
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewrite test-cases to not use req.backend
parent
336bd586
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
83 additions
and
62 deletions
+83
-62
b00026.vtc
bin/varnishtest/tests/b00026.vtc
+5
-2
c00009.vtc
bin/varnishtest/tests/c00009.vtc
+6
-3
c00028.vtc
bin/varnishtest/tests/c00028.vtc
+2
-2
c00038.vtc
bin/varnishtest/tests/c00038.vtc
+6
-4
c00043.vtc
bin/varnishtest/tests/c00043.vtc
+3
-3
e00006.vtc
bin/varnishtest/tests/e00006.vtc
+4
-4
m00009.vtc
bin/varnishtest/tests/m00009.vtc
+2
-2
m00010.vtc
bin/varnishtest/tests/m00010.vtc
+2
-2
r00255.vtc
bin/varnishtest/tests/r00255.vtc
+5
-1
r00263.vtc
bin/varnishtest/tests/r00263.vtc
+2
-2
r00306.vtc
bin/varnishtest/tests/r00306.vtc
+2
-2
r00433.vtc
bin/varnishtest/tests/r00433.vtc
+4
-4
r00722.vtc
bin/varnishtest/tests/r00722.vtc
+2
-2
r00916.vtc
bin/varnishtest/tests/r00916.vtc
+2
-2
r01073.vtc
bin/varnishtest/tests/r01073.vtc
+6
-4
r01144.vtc
bin/varnishtest/tests/r01144.vtc
+6
-6
r01164.vtc
bin/varnishtest/tests/r01164.vtc
+4
-4
v00007.vtc
bin/varnishtest/tests/v00007.vtc
+2
-2
v00009.vtc
bin/varnishtest/tests/v00009.vtc
+2
-2
v00014.vtc
bin/varnishtest/tests/v00014.vtc
+1
-1
v00016.vtc
bin/varnishtest/tests/v00016.vtc
+2
-1
v00018.vtc
bin/varnishtest/tests/v00018.vtc
+1
-1
v00022.vtc
bin/varnishtest/tests/v00022.vtc
+3
-1
v00026.vtc
bin/varnishtest/tests/v00026.vtc
+3
-1
v00027.vtc
bin/varnishtest/tests/v00027.vtc
+3
-3
v00036.vtc
bin/varnishtest/tests/v00036.vtc
+3
-1
No files found.
bin/varnishtest/tests/b00026.vtc
View file @
2eddf20c
...
...
@@ -29,13 +29,16 @@ varnish v1 -vcl {
sub vcl_recv {
if (req.url == "from_backend") {
set req.backend = b1;
return(pass);
}
set req.backend = b2;
}
sub vcl_backend_fetch {
set bereq.first_byte_timeout = 2s;
if (bereq.url == "from_backend") {
set bereq.backend = b1;
} else {
set bereq.backend = b2;
}
}
} -start
varnish v1 -cliok "param.set first_byte_timeout 0.5"
...
...
bin/varnishtest/tests/c00009.vtc
View file @
2eddf20c
...
...
@@ -14,10 +14,13 @@ server s2 {
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.restarts == 0) {
set req.backend = s1;
set req.http.restarts = req.restarts;
}
sub vcl_backend_fetch {
if (bereq.http.restarts == "0") {
set bereq.backend = s1;
} else {
set req.backend = s2;
set
be
req.backend = s2;
}
}
...
...
bin/varnishtest/tests/c00028.vtc
View file @
2eddf20c
...
...
@@ -5,8 +5,8 @@ varnish v1 -vcl {
.host = "${bad_ip}"; .port = "9090";
}
sub vcl_
recv
{
set req.backend = bad;
sub vcl_
backend_fetch
{
set
be
req.backend = bad;
}
sub vcl_error {
return (restart);
...
...
bin/varnishtest/tests/c00038.vtc
View file @
2eddf20c
...
...
@@ -17,11 +17,13 @@ varnish v1 -vcl+backend {
if (req.http.x-ignorebusy == "1") {
set req.hash_ignore_busy = true;
}
if (req.http.x-client == "1") {
set req.backend = s1;
}
sub vcl_backend_fetch {
if (bereq.http.x-client == "1") {
set bereq.backend = s1;
}
if (req.http.x-client == "2") {
set req.backend = s2;
if (
be
req.http.x-client == "2") {
set
be
req.backend = s2;
}
}
} -start
...
...
bin/varnishtest/tests/c00043.vtc
View file @
2eddf20c
...
...
@@ -16,9 +16,9 @@ server s2 {
} -start
varnish v1 -vcl+backend {
sub vcl_
recv
{
if (req.http.bar) {
set req.backend = s2;
sub vcl_
backend_fetch
{
if (
be
req.http.bar) {
set
be
req.backend = s2;
}
}
} -start
...
...
bin/varnishtest/tests/e00006.vtc
View file @
2eddf20c
...
...
@@ -22,11 +22,11 @@ server s2 {
} -start
varnish v1 -vcl+backend {
sub vcl_
recv
{
if (req.http.host == "bozz") {
set req.backend = s2;
sub vcl_
backend_fetch
{
if (
be
req.http.host == "bozz") {
set
be
req.backend = s2;
} else {
set req.backend = s1;
set
be
req.backend = s1;
}
}
sub vcl_backend_response {
...
...
bin/varnishtest/tests/m00009.vtc
View file @
2eddf20c
...
...
@@ -34,8 +34,8 @@ varnish v1 -vcl+backend {
rr.add_backend(s4);
}
sub vcl_
recv
{
set req.backend = rr.backend();
sub vcl_
backend_fetch
{
set
be
req.backend = rr.backend();
}
} -start
...
...
bin/varnishtest/tests/m00010.vtc
View file @
2eddf20c
...
...
@@ -47,8 +47,8 @@ varnish v1 -vcl+backend {
rr3.add_backend(rr2.backend());
}
sub vcl_
recv
{
set req.backend = rr3.backend();
sub vcl_
backend_fetch
{
set
be
req.backend = rr3.backend();
}
} -start
...
...
bin/varnishtest/tests/r00255.vtc
View file @
2eddf20c
...
...
@@ -10,7 +10,11 @@ server s1 {
-body "012345\n"
} -start
varnish v1 -vcl+backend { sub vcl_recv {set req.backend = s1;} } -start
varnish v1 -vcl+backend {
sub vcl_backend_fetch {
set bereq.backend = s1;
}
} -start
client c1 {
txreq -url "/"
...
...
bin/varnishtest/tests/r00263.vtc
View file @
2eddf20c
...
...
@@ -16,8 +16,8 @@ varnish v1 -vcl {
cluster.add_backend(node3, 1);
}
sub vcl_
recv
{
set req.backend = cluster.backend();
sub vcl_
backend_fetch
{
set
be
req.backend = cluster.backend();
}
} -start
...
...
bin/varnishtest/tests/r00306.vtc
View file @
2eddf20c
...
...
@@ -33,8 +33,8 @@ varnish v1 -vcl {
foo.add_backend(s2, 1);
}
sub vcl_
recv
{
set req.backend = foo.backend();
sub vcl_
backend_fetch
{
set
be
req.backend = foo.backend();
}
} -start
...
...
bin/varnishtest/tests/r00433.vtc
View file @
2eddf20c
...
...
@@ -23,11 +23,11 @@ server s2 {
} -start
varnish v1 -vcl+backend {
sub vcl_
recv
{
if (req.url == "/foo") {
set req.backend = s1;
sub vcl_
backend_fetch
{
if (
be
req.url == "/foo") {
set
be
req.backend = s1;
} else {
set req.backend = s2;
set
be
req.backend = s2;
}
}
...
...
bin/varnishtest/tests/r00722.vtc
View file @
2eddf20c
...
...
@@ -22,8 +22,8 @@ varnish v1 -vcl+backend {
foo.add_backend(b2, 1);
foo.add_backend(b3, 1);
}
sub vcl_
recv
{
set req.backend = foo.backend();
sub vcl_
backend_fetch
{
set
be
req.backend = foo.backend();
}
} -start
...
...
bin/varnishtest/tests/r00916.vtc
View file @
2eddf20c
...
...
@@ -10,8 +10,8 @@ varnish v1 -errvcl {Symbol not found: 's-1' (expected type BACKEND)} {
sub s1 {
}
sub vcl_backend_response {
if (req.backend == s-1){
set req.backend = s-1;
if (
be
req.backend == s-1){
set
be
req.backend = s-1;
}
}
}
bin/varnishtest/tests/r01073.vtc
View file @
2eddf20c
...
...
@@ -19,11 +19,13 @@ varnish v1 -vcl+backend {
if (req.http.x-hash-always-miss == "1") {
set req.hash_always_miss = true;
}
if (req.http.x-client == "1") {
set req.backend = s1;
}
sub vcl_backend_fetch {
if (bereq.http.x-client == "1") {
set bereq.backend = s1;
}
if (req.http.x-client == "2") {
set req.backend = s2;
if (
be
req.http.x-client == "2") {
set
be
req.backend = s2;
}
}
} -start
...
...
bin/varnishtest/tests/r01144.vtc
View file @
2eddf20c
...
...
@@ -11,9 +11,9 @@ varnish v1 -vcl+backend {
.host = "127.0.0.1";
.port = "54321";
}
sub vcl_
recv
{
if (req.url == "never") {
set req.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
sub vcl_
backend_fetch
{
if (
be
req.url == "never") {
set
be
req.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
}
}
} -start
...
...
@@ -30,9 +30,9 @@ varnish v1 -errvcl {Expected ID got '0'} {
.host = "127.0.0.1";
.port = "54321";
}
sub vcl_
recv
{
if (req.url == "never") {
set req.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
sub vcl_
backend_fetch
{
if (
be
req.url == "never") {
set
be
req.backend = fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210;
}
}
}
bin/varnishtest/tests/r01164.vtc
View file @
2eddf20c
...
...
@@ -5,8 +5,8 @@ varnish v1 -vcl {
.host = "127.0.0.1";
}
sub vcl_
recv
{
set req.backend = storage_foo;
sub vcl_
backend_fetch
{
set
be
req.backend = storage_foo;
}
}
...
...
@@ -15,8 +15,8 @@ varnish v1 -vcl {
.host = "127.0.0.1";
}
sub vcl_
recv
{
set req.backend = storagefoo;
sub vcl_
backend_fetch
{
set
be
req.backend = storagefoo;
}
}
...
...
bin/varnishtest/tests/v00007.vtc
View file @
2eddf20c
...
...
@@ -16,8 +16,8 @@ varnish v1 -vcl+backend {
foo.add_backend(s1, 1);
}
sub vcl_
recv
{
set req.backend = foo.backend();
sub vcl_
backend_fetch
{
set
be
req.backend = foo.backend();
}
} -start
...
...
bin/varnishtest/tests/v00009.vtc
View file @
2eddf20c
...
...
@@ -33,8 +33,8 @@ varnish v1 -vcl+backend {
batman.add_backend(s4);
}
sub vcl_
recv
{
set req.backend = batman.backend();
sub vcl_
backend_fetch
{
set
be
req.backend = batman.backend();
}
} -start
...
...
bin/varnishtest/tests/v00014.vtc
View file @
2eddf20c
...
...
@@ -27,7 +27,7 @@ varnish v1 -vcl {
}
sub vcl_recv {
if (std.healthy(
req.backend
)) {
if (std.healthy(
default
)) {
return(error(200,"Backend healthy"));
} else {
return(error(500,"Backend sick"));
...
...
bin/varnishtest/tests/v00016.vtc
View file @
2eddf20c
...
...
@@ -84,8 +84,9 @@ varnish v1 -errvcl {Expression has type DURATION, expected BOOL} {
}
varnish v1 -errvcl {Operator > not possible on BACKEND} {
backend a { .host = "127.0.0.1"; }
backend b { .host = "127.0.0.1"; }
sub vcl_recv { if (
req.backend
> b) { } }
sub vcl_recv { if (
a
> b) { } }
}
varnish v1 -errvcl {Symbol not found: 'req.hash' (expected type BOOL):} {
...
...
bin/varnishtest/tests/v00018.vtc
View file @
2eddf20c
...
...
@@ -29,7 +29,7 @@ varnish v1 -errvcl {Expected '=' got '>>'} {
varnish v1 -errvcl {Expected '=' got '+='} {
backend b { .host = "127.0.0.1"; }
sub vcl_
recv { set
req.backend += b; }
sub vcl_
backend_fetch { set be
req.backend += b; }
}
varnish v1 -errvcl {Expected '=' got '+='} {
...
...
bin/varnishtest/tests/v00022.vtc
View file @
2eddf20c
...
...
@@ -43,9 +43,11 @@ varnish v1 -vcl+backend {
}
sub vcl_recv {
set req.backend = foo.backend();
return(pass);
}
sub vcl_backend_fetch {
set bereq.backend = foo.backend();
}
} -start
# NB: Do not change the number 1
...
...
bin/varnishtest/tests/v00026.vtc
View file @
2eddf20c
...
...
@@ -25,9 +25,11 @@ varnish v1 -vcl+backend {
}
sub vcl_recv {
set req.backend = h1.backend(req.url);
return(pass);
}
sub vcl_backend_fetch {
set bereq.backend = h1.backend(bereq.url);
}
} -start
...
...
bin/varnishtest/tests/v00027.vtc
View file @
2eddf20c
...
...
@@ -20,9 +20,9 @@ varnish v1 -vcl {
.port = "${s2_port}";
}
sub vcl_
recv
{
if (
req.url !=
req.url) {
set req.backend = s1;
sub vcl_
backend_fetch
{
if (
bereq.url != be
req.url) {
set
be
req.backend = s1;
}
}
} -start
...
...
bin/varnishtest/tests/v00036.vtc
View file @
2eddf20c
...
...
@@ -26,9 +26,11 @@ varnish v1 -vcl+backend {
}
sub vcl_recv {
set req.backend = fb1.backend();
return (pass);
}
sub vcl_backend_fetch {
set bereq.backend = fb1.backend();
}
} -start
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment