Skip to content

V
varnishevent3
Commit 32046085 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Eliminate as many hardcoded addresses as possible using macros 

in VCL snippets.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4366 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 37fc91f2
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 38 deletions
bin/varnishtest/tests/b00022.vtc
View file @ 32046085
......@@ -2,7 +2,7 @@
test "Check the between_bytes_timeout behaves from backend definition"
server s1 -listen 127.0.0.1:9080 {
server s1 {
rxreq
send "HTTP/1.1 200 Ok\r\nConnection: close\r\n\r\n"
delay 1.5
......@@ -11,8 +11,8 @@ server s1 -listen 127.0.0.1:9080 {
varnish v1 -vcl {
backend b1 {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
.between_bytes_timeout = 1s;
}
} -start
......
bin/varnishtest/tests/b00025.vtc
View file @ 32046085
......@@ -2,7 +2,7 @@
test "Check that the first_byte_timeout works from backend definition"
server s1 -listen 127.0.0.1:9080 {
server s1 {
rxreq
delay 1.5
txresp
......@@ -10,8 +10,8 @@ server s1 -listen 127.0.0.1:9080 {
varnish v1 -vcl {
backend b1 {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
.first_byte_timeout = 1s;
}
} -start
......
bin/varnishtest/tests/b00026.vtc
View file @ 32046085
......@@ -2,13 +2,13 @@
test "Check the precedence for timeouts"
server s1 -listen 127.0.0.1:9080 {
server s1 {
rxreq
expect req.url == "from_backend"
delay 1;
txresp
} -start
server s2 -listen 127.0.0.1:9180 {
server s2 {
rxreq
expect req.url == "from_vcl"
delay 1.5;
......@@ -17,13 +17,13 @@ server s2 -listen 127.0.0.1:9180 {
varnish v1 -vcl {
backend b1 {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
.first_byte_timeout = 2s;
}
backend b2 {
.host = "127.0.0.1";
.port = "9180";
.host = "${s2_addr}";
.port = "${s2_port}";
.first_byte_timeout = 1s;
}
......
bin/varnishtest/tests/c00024.vtc
View file @ 32046085
......@@ -2,19 +2,22 @@
test "Test restart in vcl_error"
server s1 -listen 127.0.0.1:9080 {
server s1 {
rxreq
txresp
} -start
server s2 {
} -start
varnish v1 -vcl {
backend bad {
.host = "127.0.0.1";
.port = "9099";
.host = "${s2_addr}";
.port = "${s2_port}";
}
backend good {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
}
sub vcl_recv {
if (req.restarts > 0) {
......
bin/varnishtest/tests/c00030.vtc
View file @ 32046085
......@@ -2,7 +2,7 @@
test "Test that saintmode_threshold in VCL"
server s1 -listen 127.0.0.1:9080 {
server s1 {
rxreq
txresp
......@@ -30,8 +30,8 @@ server s1 -listen 127.0.0.1:9080 {
varnish v1 -arg "-p saintmode_threshold=10" -vcl {
backend foo {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
.saintmode_threshold = 2;
}
......
bin/varnishtest/tests/r00306.vtc
View file @ 32046085
......@@ -2,7 +2,7 @@
test "Regression test for ticket #306, random director ignoring good backend"
server s1 -listen 127.0.0.1:9080 {
server s1 {
rxreq
expect req.url == /foo
......@@ -14,17 +14,17 @@ server s1 -listen 127.0.0.1:9080 {
} -start
server s2 -listen 127.0.0.1:9180 {
server s2 {
rxreq
txresp -status 404
} -start
varnish v1 -vcl {
backend s1 {
.host = "127.0.0.1"; .port = "9080";
.host = "${s1_addr}"; .port = "${s1_port}";
}
backend s2 {
.host = "127.0.0.1"; .port = "9180";
.host = "${s2_addr}"; .port = "${s2_port}";
.probe = {
.url = "/";
.initial = 0;
......
bin/varnishtest/tests/s00002.vtc
View file @ 32046085
......@@ -2,7 +2,7 @@
test "Check grace with sick backends"
server s1 -listen 127.0.0.1:9080 -repeat 4 {
server s1 -repeat 4 {
rxreq
expect req.url == "/"
txresp -body "hi"
......@@ -10,8 +10,8 @@ server s1 -listen 127.0.0.1:9080 -repeat 4 {
varnish v1 -vcl {
backend b {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
.probe = {
.url = "/";
.timeout = 30ms;
......
bin/varnishtest/tests/v00006.vtc
View file @ 32046085
......@@ -27,15 +27,15 @@ varnish v1 -expect n_vcl_discard == 0
# Set up a new VCL and backend
server s2 -listen 127.0.0.1:9180 {
server s2 {
rxreq
txresp
} -start
varnish v1 -vcl {
backend b2 {
.host = "127.0.0.1";
.port = "9180";
.host = "${s2_addr}";
.port = "${s2_port}";
}
}
......
bin/varnishtest/tests/v00008.vtc
View file @ 32046085
......@@ -23,7 +23,7 @@ client c1 {
rxresp
} -run
server s2 -listen 127.0.0.1:9180 {
server s2 {
rxreq
expect req.url == "/barf"
expect req.http.host == "FOObar"
......@@ -32,8 +32,8 @@ server s2 -listen 127.0.0.1:9180 {
varnish v1 -vcl {
backend b1 {
.host = "127.0.0.1";
.port = "9180";
.host = "${s2_addr}";
.port = "${s2_port}";
.host_header = "FOObar";
}
}
......
bin/varnishtest/tests/v00012.vtc
View file @ 32046085
......@@ -2,7 +2,7 @@
test "Check backend connection limit"
server s1 -listen 127.0.0.1:9080 {
server s1 {
rxreq
sema r1 sync 2
sema r2 sync 2
......@@ -12,8 +12,8 @@ server s1 -listen 127.0.0.1:9080 {
varnish v1 -vcl {
backend default {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
.max_connections = 1;
}
sub vcl_recv {
......
bin/varnishtest/tests/v00014.vtc
View file @ 32046085
......@@ -11,8 +11,8 @@ server s1 {
varnish v1 -vcl {
backend default {
.host = "127.0.0.1";
.port = "9080";
.host = "${s1_addr}";
.port = "${s1_port}";
.max_connections = 1;
.probe = {
.url = "/";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment