r4366 - trunk/varnish-cache/bin/varnishtest/tests
phk at projects.linpro.no
phk at projects.linpro.no
Tue Nov 24 21:02:34 CET 2009
Author: phk
Date: 2009-11-24 21:02:33 +0100 (Tue, 24 Nov 2009)
New Revision: 4366
Modified:
trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc
trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc
trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc
trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc
trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc
trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc
trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc
trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc
trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc
Log:
Eliminate as many hardcoded addresses as possible using macros
in VCL snippets.
Modified: trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00022.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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 @@
varnish v1 -vcl {
backend b1 {
- .host = "127.0.0.1";
- .port = "9080";
+ .host = "${s1_addr}";
+ .port = "${s1_port}";
.between_bytes_timeout = 1s;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00025.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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 @@
varnish v1 -vcl {
backend b1 {
- .host = "127.0.0.1";
- .port = "9080";
+ .host = "${s1_addr}";
+ .port = "${s1_port}";
.first_byte_timeout = 1s;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/b00026.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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 @@
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;
}
Modified: trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00024.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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) {
Modified: trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00030.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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 @@
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;
}
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00306.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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 @@
} -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;
Modified: trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/s00002.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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 @@
varnish v1 -vcl {
backend b {
- .host = "127.0.0.1";
- .port = "9080";
+ .host = "${s1_addr}";
+ .port = "${s1_port}";
.probe = {
.url = "/";
.timeout = 30ms;
Modified: trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00006.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -27,15 +27,15 @@
# 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}";
}
}
Modified: trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00008.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -23,7 +23,7 @@
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 @@
varnish v1 -vcl {
backend b1 {
- .host = "127.0.0.1";
- .port = "9180";
+ .host = "${s2_addr}";
+ .port = "${s2_port}";
.host_header = "FOObar";
}
}
Modified: trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00012.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -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 @@
varnish v1 -vcl {
backend default {
- .host = "127.0.0.1";
- .port = "9080";
+ .host = "${s1_addr}";
+ .port = "${s1_port}";
.max_connections = 1;
}
sub vcl_recv {
Modified: trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc 2009-11-24 19:41:09 UTC (rev 4365)
+++ trunk/varnish-cache/bin/varnishtest/tests/v00014.vtc 2009-11-24 20:02:33 UTC (rev 4366)
@@ -11,8 +11,8 @@
varnish v1 -vcl {
backend default {
- .host = "127.0.0.1";
- .port = "9080";
+ .host = "${s1_addr}";
+ .port = "${s1_port}";
.max_connections = 1;
.probe = {
.url = "/";
More information about the varnish-commit
mailing list