phk at varnish-cache
May 2, 2012, 4:19 AM
Post #1 of 1
(49 views)
Permalink
|
|
[master] cb13f32 Convert a lot of testcases which don't care how the response was transferred to examine resp.bodylen instead of resp.http.content-length.
|
|
commit cb13f327e27a11d6d928692f7c7d56ae4566f98e
Author: Poul-Henning Kamp <phk [at] FreeBSD>
Date: Wed May 2 11:18:05 2012 +0000
Convert a lot of testcases which don't care how the response was
transferred to examine resp.bodylen instead of resp.http.content-length.
(This is in preparation for streaming being default)
diff --git a/bin/varnishtest/tests/b00007.vtc b/bin/varnishtest/tests/b00007.vtc
index 58740c6..a07ae9e 100644
--- a/bin/varnishtest/tests/b00007.vtc
+++ b/bin/varnishtest/tests/b00007.vtc
@@ -26,9 +26,9 @@ client c1 {
txreq -url "/bar"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "8"
+ expect resp.bodylen == "8"
} -run
diff --git a/bin/varnishtest/tests/b00011.vtc b/bin/varnishtest/tests/b00011.vtc
index 9c4e2d3..1e9ee74 100644
--- a/bin/varnishtest/tests/b00011.vtc
+++ b/bin/varnishtest/tests/b00011.vtc
@@ -16,5 +16,5 @@ client c1 {
txreq -url "/"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 36
+ expect resp.bodylen == 36
} -run
diff --git a/bin/varnishtest/tests/b00012.vtc b/bin/varnishtest/tests/b00012.vtc
index 967ed85..154f6c0 100644
--- a/bin/varnishtest/tests/b00012.vtc
+++ b/bin/varnishtest/tests/b00012.vtc
@@ -15,15 +15,15 @@ client c1 {
send "GET /foo HTTP/1.1\n\nGET /bar HTTP/1.1\n\nGET /bar HTTP/1.1\n\n"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 3
+ expect resp.bodylen == 3
expect resp.http.x-varnish == "1001"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1002"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1003 1002"
} -run
diff --git a/bin/varnishtest/tests/b00013.vtc b/bin/varnishtest/tests/b00013.vtc
index 8ae90c4..b8e25e6 100644
--- a/bin/varnishtest/tests/b00013.vtc
+++ b/bin/varnishtest/tests/b00013.vtc
@@ -15,17 +15,17 @@ client c1 {
send "GET /foo HTTP/1.1\r\n\r\nGET "
rxresp
expect resp.status == 200
- expect resp.http.content-length == 3
+ expect resp.bodylen == 3
expect resp.http.x-varnish == "1001"
send "/bar HTTP/1.1\n\nGET /bar "
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1002"
send "HTTP/1.1\n\n"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1003 1002"
} -run
diff --git a/bin/varnishtest/tests/c00006.vtc b/bin/varnishtest/tests/c00006.vtc
index c2c8ec2..9342886 100644
--- a/bin/varnishtest/tests/c00006.vtc
+++ b/bin/varnishtest/tests/c00006.vtc
@@ -15,7 +15,7 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 5
+ expect resp.bodylen == 5
}
client c1 -run
@@ -26,7 +26,7 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
}
client c1 -run
diff --git a/bin/varnishtest/tests/c00008.vtc b/bin/varnishtest/tests/c00008.vtc
index 3045a5b..69c64d4 100644
--- a/bin/varnishtest/tests/c00008.vtc
+++ b/bin/varnishtest/tests/c00008.vtc
@@ -15,7 +15,7 @@ client c1 {
rxresp
expect resp.status == 200
expect resp.http.etag == "foo"
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
txreq -url "/foo" \
-hdr "If-Modified-Since: Thu, 26 Jun 2008 12:00:00 GMT"
diff --git a/bin/varnishtest/tests/c00009.vtc b/bin/varnishtest/tests/c00009.vtc
index 295b092..d0c4b71 100644
--- a/bin/varnishtest/tests/c00009.vtc
+++ b/bin/varnishtest/tests/c00009.vtc
@@ -32,7 +32,7 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
}
client c1 -run
diff --git a/bin/varnishtest/tests/c00010.vtc b/bin/varnishtest/tests/c00010.vtc
index 81ed5b6..6f0aca3 100644
--- a/bin/varnishtest/tests/c00010.vtc
+++ b/bin/varnishtest/tests/c00010.vtc
@@ -19,12 +19,12 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1001"
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 7
+ expect resp.bodylen == 7
expect resp.http.x-varnish == "1002"
}
diff --git a/bin/varnishtest/tests/c00011.vtc b/bin/varnishtest/tests/c00011.vtc
index 18ee757..6bea217 100644
--- a/bin/varnishtest/tests/c00011.vtc
+++ b/bin/varnishtest/tests/c00011.vtc
@@ -19,12 +19,12 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1001"
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 7
+ expect resp.bodylen == 7
expect resp.http.x-varnish == "1002"
}
diff --git a/bin/varnishtest/tests/c00012.vtc b/bin/varnishtest/tests/c00012.vtc
index 24326d8..b578625 100644
--- a/bin/varnishtest/tests/c00012.vtc
+++ b/bin/varnishtest/tests/c00012.vtc
@@ -19,12 +19,12 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1001"
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 7
+ expect resp.bodylen == 7
expect resp.http.x-varnish == "1002"
}
diff --git a/bin/varnishtest/tests/c00013.vtc b/bin/varnishtest/tests/c00013.vtc
index 94c86ca..885be31 100644
--- a/bin/varnishtest/tests/c00013.vtc
+++ b/bin/varnishtest/tests/c00013.vtc
@@ -16,7 +16,7 @@ client c1 {
txreq -url "/foo" -hdr "client: c1"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 12
+ expect resp.bodylen == 12
expect resp.http.x-varnish == "1001"
} -start
@@ -26,7 +26,7 @@ client c2 {
sema r1 sync 2
rxresp
expect resp.status == 200
- expect resp.http.content-length == 12
+ expect resp.bodylen == 12
expect resp.http.x-varnish == "1002 1001"
} -run
diff --git a/bin/varnishtest/tests/c00014.vtc b/bin/varnishtest/tests/c00014.vtc
index 03089d8..545c469 100644
--- a/bin/varnishtest/tests/c00014.vtc
+++ b/bin/varnishtest/tests/c00014.vtc
@@ -23,7 +23,7 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 12
+ expect resp.bodylen == 12
expect resp.http.x-varnish == "1001"
} -start
sema r1 sync 2
@@ -31,7 +31,7 @@ client c2 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1002"
} -run
diff --git a/bin/varnishtest/tests/c00015.vtc b/bin/varnishtest/tests/c00015.vtc
index 755669b..c323b9c 100644
--- a/bin/varnishtest/tests/c00015.vtc
+++ b/bin/varnishtest/tests/c00015.vtc
@@ -25,7 +25,7 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1001"
} -run
@@ -35,7 +35,7 @@ client c2 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 7
+ expect resp.bodylen == 7
expect resp.http.x-varnish == "1002"
} -run
@@ -45,7 +45,7 @@ client c3 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.x-varnish == "1003 1001"
} -run
diff --git a/bin/varnishtest/tests/c00025.vtc b/bin/varnishtest/tests/c00025.vtc
index 668fdc2..d0cd83d 100644
--- a/bin/varnishtest/tests/c00025.vtc
+++ b/bin/varnishtest/tests/c00025.vtc
@@ -13,7 +13,7 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
txreq -url "/foo" \
-hdr "If-None-Match: 12345678"
diff --git a/bin/varnishtest/tests/c00026.vtc b/bin/varnishtest/tests/c00026.vtc
index 427efe4..5dcbd41 100644
--- a/bin/varnishtest/tests/c00026.vtc
+++ b/bin/varnishtest/tests/c00026.vtc
@@ -14,7 +14,7 @@ client c1 {
txreq -url "/foo"
rxresp
expect resp.status == 200
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
txreq -url "/foo" \
-hdr "If-None-Match: 123456789"
diff --git a/bin/varnishtest/tests/e00000.vtc b/bin/varnishtest/tests/e00000.vtc
index 9aa9f55..1cc41fc 100644
--- a/bin/varnishtest/tests/e00000.vtc
+++ b/bin/varnishtest/tests/e00000.vtc
@@ -18,7 +18,7 @@ client c1 {
txreq
rxresp
expect resp.status == 200
- expect resp.http.content-length == 33
+ expect resp.bodylen == 33
}
client c1 -run
diff --git a/bin/varnishtest/tests/e00009.vtc b/bin/varnishtest/tests/e00009.vtc
index 8a7927d..f3754ff 100644
--- a/bin/varnishtest/tests/e00009.vtc
+++ b/bin/varnishtest/tests/e00009.vtc
@@ -28,7 +28,6 @@ client c1 {
rxresp
expect resp.status == 200
expect resp.bodylen == 57
- expect resp.http.content-length == 57
} -run
varnish v1 -cli "param.set esi_syntax 1"
diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc
index 217668f..7fe2b8c 100644
--- a/bin/varnishtest/tests/m00000.vtc
+++ b/bin/varnishtest/tests/m00000.vtc
@@ -21,7 +21,7 @@ client c1 {
txreq -url "/bar"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
expect resp.http.foo == "BAR"
expect resp.http.bar == "foo"
} -run
diff --git a/bin/varnishtest/tests/m00001.vtc b/bin/varnishtest/tests/m00001.vtc
index b7ca47f..dd2b064 100644
--- a/bin/varnishtest/tests/m00001.vtc
+++ b/bin/varnishtest/tests/m00001.vtc
@@ -21,7 +21,7 @@ client c1 {
txreq -url "/bar"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
expect resp.http.foo == "BAR"
expect resp.http.bar == "foo"
} -run
@@ -33,7 +33,7 @@ client c1 {
txreq -url "/bar"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
expect resp.http.foo == "bAr"
expect resp.http.bar == "fOo"
} -run
diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index 30a0f3c..67d984d 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -21,7 +21,7 @@ client c1 {
txreq -url "/bar"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
expect resp.http.foo == "BAR"
expect resp.http.bar == "foo"
} -run
diff --git a/bin/varnishtest/tests/m00004.vtc b/bin/varnishtest/tests/m00004.vtc
index 0dbe2cc..232428b 100644
--- a/bin/varnishtest/tests/m00004.vtc
+++ b/bin/varnishtest/tests/m00004.vtc
@@ -34,21 +34,21 @@ client c1 {
txreq -url "/one"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
expect resp.http.foo == "bar"
expect resp.http.one == "File One"
txreq -url "/two"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
expect resp.http.foo == "bar"
expect resp.http.two == "File Two"
txreq -url "/three"
rxresp
expect resp.status == 200
- expect resp.http.content-length == "4"
+ expect resp.bodylen == "4"
expect resp.http.foo == "bar"
expect resp.http.three == "File Three"
} -run
diff --git a/bin/varnishtest/tests/r00911.vtc b/bin/varnishtest/tests/r00911.vtc
index f85556c..5663421 100644
--- a/bin/varnishtest/tests/r00911.vtc
+++ b/bin/varnishtest/tests/r00911.vtc
@@ -15,6 +15,5 @@ varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend {
client c1 {
txreq -url /bar
rxresp
- expect resp.http.content-length == 6
expect resp.bodylen == 6
} -run
diff --git a/bin/varnishtest/tests/r00913.vtc b/bin/varnishtest/tests/r00913.vtc
index 519436f..e310360 100644
--- a/bin/varnishtest/tests/r00913.vtc
+++ b/bin/varnishtest/tests/r00913.vtc
@@ -17,6 +17,6 @@ varnish v1 -vcl+backend {
client c1 {
txreq -url /bar
rxresp
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
expect resp.http.foo == "XXX"
} -run
diff --git a/bin/varnishtest/tests/r00917.vtc b/bin/varnishtest/tests/r00917.vtc
index 9791034..689d952 100644
--- a/bin/varnishtest/tests/r00917.vtc
+++ b/bin/varnishtest/tests/r00917.vtc
@@ -11,7 +11,7 @@ varnish v1 -vcl+backend { } -start
client c1 {
txreq -url /bar
rxresp
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
} -run
varnish v1 -cliok {ban req.url ~ << foo
diff --git a/bin/varnishtest/tests/s00000.vtc b/bin/varnishtest/tests/s00000.vtc
index 717dd02..bde8934 100644
--- a/bin/varnishtest/tests/s00000.vtc
+++ b/bin/varnishtest/tests/s00000.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl+backend { } -start
client c1 {
txreq -url "/"
rxresp
- expect resp.http.content-length == 5
+ expect resp.bodylen == 5
expect resp.http.x-varnish == "1001"
expect resp.status == 200
} -run
@@ -27,5 +27,5 @@ client c2 {
rxresp
expect resp.status == 200
expect resp.http.x-varnish == "1002"
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
} -run
diff --git a/bin/varnishtest/tests/s00001.vtc b/bin/varnishtest/tests/s00001.vtc
index 1dd34bc..68fd520 100644
--- a/bin/varnishtest/tests/s00001.vtc
+++ b/bin/varnishtest/tests/s00001.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl+backend { } -start
client c1 {
txreq -url "/"
rxresp
- expect resp.http.content-length == 5
+ expect resp.bodylen == 5
expect resp.http.x-varnish == "1001"
expect resp.status == 200
} -run
@@ -28,5 +28,5 @@ client c2 {
rxresp
expect resp.status == 200
expect resp.http.x-varnish == "1002"
- expect resp.http.content-length == 6
+ expect resp.bodylen == 6
} -run
diff --git a/bin/varnishtest/tests/v00009.vtc b/bin/varnishtest/tests/v00009.vtc
index 04b8ccb..5a5d769 100644
--- a/bin/varnishtest/tests/v00009.vtc
+++ b/bin/varnishtest/tests/v00009.vtc
@@ -39,16 +39,16 @@ client c1 {
timeout 3
txreq -url "/foo1"
rxresp
- expect resp.http.content-length == 1
+ expect resp.bodylen == 1
txreq -url "/foo2"
rxresp
- expect resp.http.content-length == 2
+ expect resp.bodylen == 2
txreq -url "/foo3"
rxresp
- expect resp.http.content-length == 3
+ expect resp.bodylen == 3
txreq -url "/foo4"
rxresp
- expect resp.http.content-length == 4
+ expect resp.bodylen == 4
} -run
server s1 -start
@@ -58,8 +58,8 @@ client c2 {
timeout 3
txreq -url "/foo11"
rxresp
- expect resp.http.content-length == 1
+ expect resp.bodylen == 1
txreq -url "/foo22"
rxresp
- expect resp.http.content-length == 2
+ expect resp.bodylen == 2
} -run
_______________________________________________
varnish-commit mailing list
varnish-commit [at] varnish-cache
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
|
