Go over the b* series of tests:

	add expectes for stats counters where necessary
	generally polish.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3052 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishtest/tests/b00000.vtc b/varnish-cache/bin/varnishtest/tests/b00000.vtc
index f9f9e679b88d898fd434361e51501809e9fb537d..72a34e3822571f34cc4a4a0cb3d9654d606f6135 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00000.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00000.vtc
@@ -2,23 +2,29 @@
 #
 # $Id$
 
-varnish v1 -arg "-b 127.0.0.1:9080" -start
+test "Does anything get through at all ?"
 
 server s1 {
        rxreq 
-       txresp -hdr "Connection: close" -body "012345\n"
-}
+       txresp -body "012345\n"
+} -start
 
-server s1 -start 
+varnish v1 -vcl+backend {} -start
+
+varnish v1 -expect n_object == 0
+varnish v1 -expect client_conn == 0
+varnish v1 -expect client_req == 0
+varnish v1 -expect cache_miss == 0
 
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
-}
-
-client c1 -run
-
-server s1 -wait
+} -run
 
-varnish v1 -stop
+varnish v1 -expect n_object == 1
+varnish v1 -expect client_conn == 1
+varnish v1 -expect client_req == 1
+varnish v1 -expect cache_miss == 1
+varnish v1 -expect s_sess == 1
+varnish v1 -expect s_req == 1

diff --git a/varnish-cache/bin/varnishtest/tests/b00001.vtc b/varnish-cache/bin/varnishtest/tests/b00001.vtc
index 971820f124c100de0246d1d52dc5b18514dec1a1..4bf4656a4b1ebd9b907ac014502b7533bb5fca37 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00001.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00001.vtc
@@ -4,10 +4,8 @@ test "Check that a pipe transaction works"
 
 server s1 -repeat 1 {
        rxreq 
-       txresp \
-               -hdr "Connection: close" \
-               -body "012345\n"
-}
+       txresp -body "012345\n"
+} -start
 
 varnish v1 -vcl+backend {
        sub vcl_recv {
@@ -15,12 +13,18 @@ varnish v1 -vcl+backend {
        }
 } -start
 
-server s1 -start 
-
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
-}
+} -run
+
+# Give varnish a chance to update stats
+delay .1
 
-client c1 -run
+varnish v1 -expect n_object == 0
+varnish v1 -expect client_conn == 1
+varnish v1 -expect client_req == 1
+varnish v1 -expect s_sess == 1
+varnish v1 -expect s_req == 1
+varnish v1 -expect s_pipe == 1

diff --git a/varnish-cache/bin/varnishtest/tests/b00002.vtc b/varnish-cache/bin/varnishtest/tests/b00002.vtc
index dab4beded3eb4bf811920adb2e9175db0ad1fbee..f9e10e33978bbafd098bf9c3af0901c0c0aa9613 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00002.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00002.vtc
@@ -2,12 +2,10 @@
 
 test "Check that a pass transaction works"
 
-server s1 -repeat 1 {
+server s1 {
        rxreq 
-       txresp \
-               -hdr "Connection: close" \
-               -body "012345\n"
-}
+       txresp -hdr "Connection: close" -body "012345\n"
+} -start
 
 varnish v1 -vcl+backend {
        sub vcl_recv {
@@ -15,12 +13,18 @@ varnish v1 -vcl+backend {
        }
 } -start
 
-server s1 -start 
-
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
-}
+} -run
+
+# Give varnish a chance to update stats
+delay .1
 
-client c1 -run
+varnish v1 -expect n_object == 0
+varnish v1 -expect client_conn == 1
+varnish v1 -expect client_req == 1
+varnish v1 -expect s_sess == 1
+varnish v1 -expect s_req == 1
+varnish v1 -expect s_pass == 1

diff --git a/varnish-cache/bin/varnishtest/tests/b00003.vtc b/varnish-cache/bin/varnishtest/tests/b00003.vtc
index 98af189d5293325c0e55c6a0025cae075867b39e..6de3ee4e70ee06025f1edd65466bf7ca7b4a5cb3 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00003.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00003.vtc
@@ -4,28 +4,32 @@ test "Check that a cache fetch + hit transaction works"
 
 server s1 {
        rxreq 
-       txresp \
-               -hdr "Connection: close" \
-               -body "012345\n"
-}
+       txresp -hdr "Connection: close" -body "012345\n"
+} -start
 
 varnish v1 -vcl+backend { } -start 
 
-server s1 -start 
-
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
        expect resp.http.X-Varnish == "1001"
-}
+} -run
 
 client c2 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
        expect resp.http.X-Varnish == "1002 1001"
-}
+} -run
+
+# Give varnish a chance to update stats
+delay .1
 
-client c1 -run
-client c2 -run
+varnish v1 -expect client_conn == 2
+varnish v1 -expect cache_hit == 1
+varnish v1 -expect cache_miss == 1
+varnish v1 -expect client_req == 2
+varnish v1 -expect s_sess == 2
+varnish v1 -expect s_req == 2
+varnish v1 -expect s_fetch == 1

diff --git a/varnish-cache/bin/varnishtest/tests/b00004.vtc b/varnish-cache/bin/varnishtest/tests/b00004.vtc
index 79ba92ff4072d380672f2501f1d226e80c8614f8..5817b5af5040f2e5e7e88390845e6655e82f60b3 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00004.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00004.vtc
@@ -8,21 +8,21 @@ server s1 {
 
 varnish v1 -vcl+backend { } 
 
-varnish v1 -cli start
-varnish v1 -cli start
-varnish v1 -cli start
+varnish v1 -cliok start
+varnish v1 -clierr 300 start
+varnish v1 -clierr 300 start
 
-varnish v1 -cli stop
-varnish v1 -cli stop
-varnish v1 -cli stop
+varnish v1 -cliok stop
+varnish v1 -clierr 300 stop
+varnish v1 -clierr 300 stop
 
-varnish v1 -cli start
-varnish v1 -cli stop
+varnish v1 -cliok start
+varnish v1 -cliok stop
 
-varnish v1 -cli start
-varnish v1 -cli stop
+varnish v1 -cliok start
+varnish v1 -cliok stop
 
-varnish v1 -cli start
-varnish v1 -cli stop
+varnish v1 -cliok start
+varnish v1 -cliok stop
 
 varnish v1 -wait

diff --git a/varnish-cache/bin/varnishtest/tests/b00005.vtc b/varnish-cache/bin/varnishtest/tests/b00005.vtc
index f290b7f87645170a9a8cad945cc969d300b60662..9eed1b32362edc4fbc500c2b6b70b845a035fd54 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00005.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00005.vtc
@@ -2,22 +2,18 @@
 
 test "Check that -s works"
 
-varnish v1 -arg "-s file,varnishtest_backing,10M -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        txresp -hdr "Connection: close" -body "012345\n"
-}
+} -start
 
-server s1 -start 
+varnish v1 -arg "-s file,varnishtest_backing,10M" -vcl+backend {}  -start
 
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
-}
-
-client c1 -run
+} -run
 
 server s1 -wait
 

diff --git a/varnish-cache/bin/varnishtest/tests/b00006.vtc b/varnish-cache/bin/varnishtest/tests/b00006.vtc
index 02ee741ddb982a4e430feff52f6c0ea752b58aae..530a3cdd02e8524c5ab65614c52f6355c830255a 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00006.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00006.vtc
@@ -2,23 +2,15 @@
 
 test "Check that -s malloc works"
 
-varnish v1 -arg "-s malloc -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        txresp -hdr "Connection: close" -body "012345\n"
-}
+} -start
 
-server s1 -start 
+varnish v1 -arg "-s malloc" -vcl+backend {} -start
 
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
-}
-
-client c1 -run
-
-server s1 -wait
-
-varnish v1 -stop
+} -run

diff --git a/varnish-cache/bin/varnishtest/tests/b00007.vtc b/varnish-cache/bin/varnishtest/tests/b00007.vtc
index 559b558df4b7c7181f40c507ac96f5ae30c6c529..8af9b4e6a63f69c3c2bc556abe70364bf9ad991e 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00007.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00007.vtc
@@ -2,8 +2,6 @@
 
 test "Check chunked encoding from backend works"
 
-varnish v1 -arg "-s malloc -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        expect req.url == "/bar"
@@ -21,9 +19,9 @@ server s1 {
        send "00000004\r\n1234\r\n"
        chunked "1234"
        chunked ""
-}
+} -start
 
-server s1 -start 
+varnish v1 -vcl+backend {} -start
 
 client c1 {
        txreq -url "/bar"
@@ -34,6 +32,4 @@ client c1 {
        rxresp
        expect resp.status == 200
        expect resp.http.content-length == "8"
-}
-
-client c1 -run
+} -run

diff --git a/varnish-cache/bin/varnishtest/tests/b00008.vtc b/varnish-cache/bin/varnishtest/tests/b00008.vtc
index 98a5f564b029f761ba03b2f4d2bfa4f6a9b183fb..baf36fbca1fe9eb14ac3983be10ace1aaeb446c2 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00008.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00008.vtc
@@ -2,20 +2,20 @@
 
 test "Test CLI help and parameter functions"
 
-varnish v1 -arg "-b localhost:9080" 
+varnish v1 -arg "-b 127.0.0.2:9080" 
 
-varnish v1 -cli "help"
+varnish v1 -cliok "help"
 
-varnish v1 -cli "param.show"
+varnish v1 -cliok "param.show"
 
-varnish v1 -cli "param.show diag_bitmap"
+varnish v1 -cliok "param.show diag_bitmap"
 
-varnish v1 -cli "param.set diag_bitmap 0x40"
+varnish v1 -cliok "param.set diag_bitmap 0x40"
 
-varnish v1 -cli "param.set diag_bitmap 0x0"
+varnish v1 -cliok "param.set diag_bitmap 0x0"
 
 varnish v1 -start
 
-varnish v1 -cli "help"
+varnish v1 -cliok "help"
 
-varnish v1 -cli "stats"
+varnish v1 -cliok "stats"

diff --git a/varnish-cache/bin/varnishtest/tests/b00009.vtc b/varnish-cache/bin/varnishtest/tests/b00009.vtc
index b6c38e82af99e33f849a33a58e3615b74ca2bb35..62a2b5d05a67a7de93458edfad8ce251dd518f18 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00009.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00009.vtc
@@ -2,23 +2,15 @@
 
 test "Check poll acceptor"
 
-varnish v1 -arg "-p acceptor=poll -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        txresp -hdr "Connection: close" -body "012345\n"
-}
+} -start
 
-server s1 -start 
+varnish v1 -arg "-p acceptor=poll" -vcl+backend {} -start
 
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
-}
-
-client c1 -run
-
-server s1 -wait
-
-varnish v1 -stop
+} -run

diff --git a/varnish-cache/bin/varnishtest/tests/b00010.vtc b/varnish-cache/bin/varnishtest/tests/b00010.vtc
index 3da8c7e95a833db4de4dc7cfec69643c60d9929a..c6be22edd6ee2e08de4025c493997a0c9cffbc95 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00010.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00010.vtc
@@ -2,14 +2,12 @@
 
 test "Check simple list hasher"
 
-varnish v1 -arg "-h simple_list -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        txresp -hdr "Connection: close" -body "012345\n"
-}
+} -start
 
-server s1 -start 
+varnish v1 -arg "-h simple_list" -vcl+backend {} -start
 
 client c1 {
        txreq -url "/"
@@ -19,10 +17,4 @@ client c1 {
        rxresp
        expect resp.status == 200
        expect resp.http.x-varnish == "1002 1001"
-}
-
-client c1 -run
-
-server s1 -wait
-
-varnish v1 -stop
+} -run

diff --git a/varnish-cache/bin/varnishtest/tests/b00011.vtc b/varnish-cache/bin/varnishtest/tests/b00011.vtc
index cc43db7dadf756d1954341dc3135d9fed65146c6..4ad854a4ec031680b0c6d92416ca62348b1f3a5f 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00011.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00011.vtc
@@ -2,23 +2,19 @@
 
 test "Check HTTP/1.0 EOF transmission"
 
-varnish v1 -arg "-h simple_list -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        txresp -hdr "Connection: close" 
        send "Body line 1\n"
        send "Body line 2\n"
        send "Body line 3\n"
-}
+} -start
 
-server s1 -start 
+varnish v1 -vcl+backend {} -start
 
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
        expect resp.http.content-length == 36
-}
-
-client c1 -run
+} -run

diff --git a/varnish-cache/bin/varnishtest/tests/b00012.vtc b/varnish-cache/bin/varnishtest/tests/b00012.vtc
index f3a5e71e1e8bab315ff1fa8b1850e5a416823f0f..a41294e7fb230931565b42c01e50a718b80eea56 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00012.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00012.vtc
@@ -2,8 +2,6 @@
 
 test "Check pipelining"
 
-varnish v1 -arg "-h simple_list -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        expect req.url == "/foo"
@@ -11,9 +9,9 @@ server s1 {
        rxreq 
        expect req.url == "/bar"
        txresp -body "foobar"
-}
+} -start 
 
-server s1 -start 
+varnish v1 -vcl+backend {} -start
 
 client c1 {
        send "GET /foo HTTP/1.1\n\nGET /bar HTTP/1.1\n\nGET /bar HTTP/1.1\n\n"
@@ -29,6 +27,6 @@ client c1 {
        expect resp.status == 200
        expect resp.http.content-length == 6
        expect resp.http.x-varnish == "1003 1002"
-}
+} -run
 
-client c1 -run
+varnish v1 -expect sess_pipeline == 2

diff --git a/varnish-cache/bin/varnishtest/tests/b00013.vtc b/varnish-cache/bin/varnishtest/tests/b00013.vtc
index cf5f508165dc21e9b692634cc3d8683c4a720fb6..eac54362201d3bd8dc83fa4c4efafb6159981822 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00013.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00013.vtc
@@ -2,8 +2,6 @@
 
 test "Check read-head / partial pipelining"
 
-varnish v1 -arg "-h simple_list -b 127.0.0.1:9080" -start
-
 server s1 {
        rxreq 
        expect req.url == "/foo"
@@ -11,9 +9,9 @@ server s1 {
        rxreq 
        expect req.url == "/bar"
        txresp -body "foobar"
-}
+} -start 
 
-server s1 -start 
+varnish v1 -vcl+backend {} -start
 
 client c1 {
        send "GET /foo HTTP/1.1\n\nGET "
@@ -31,6 +29,6 @@ client c1 {
        expect resp.status == 200
        expect resp.http.content-length == 6
        expect resp.http.x-varnish == "1003 1002"
-}
+} -run
 
-client c1 -run
+varnish v1 -expect sess_readahead == 2

diff --git a/varnish-cache/bin/varnishtest/tests/b00014.vtc b/varnish-cache/bin/varnishtest/tests/b00014.vtc
index bf7686f2292252b13e0d88b0a1aa607979a0f7a3..71049d2b787e612a92ad74c7828093f5d5936902 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00014.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00014.vtc
@@ -3,7 +3,7 @@
 test "Check -f command line arg"
 
 shell "echo 'backend foo { .host = \"127.0.0.1\"; .port = \"9080\"; }' > /tmp/_b00014.vcl" 
-varnish v1 -arg "-h simple_list -f /tmp/_b00014.vcl" -start
+varnish v1 -arg "-f /tmp/_b00014.vcl" -start
 
 server s1 {
        rxreq 
@@ -19,7 +19,7 @@ client c1 {
        rxresp
 } -run
 
-varnish v1 -cli "vcl.load foo /tmp/_b00014.vcl" -cli "vcl.use foo"
+varnish v1 -cliok "vcl.load foo /tmp/_b00014.vcl" -cliok "vcl.use foo"
 
 client c1 {
        txreq -url /bar

diff --git a/varnish-cache/bin/varnishtest/tests/b00015.vtc b/varnish-cache/bin/varnishtest/tests/b00015.vtc
index b0c249bf87c86e661553bb473002bd8858217a7e..48c6cd67d19514182f2587181923b6dc52e65406 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00015.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00015.vtc
@@ -2,7 +2,6 @@
 
 test "Check synthetic error page caching"
 
-
 # First test that an internally generated error is not cached
 
 varnish v1 -vcl { 
@@ -41,8 +40,6 @@ client c1 {
        expect resp.http.X-varnish == "1003"
 } -run
 
-server s1 -wait
-
 client c1 {
        txreq -url "/"
        rxresp
@@ -64,7 +61,7 @@ varnish v1 -vcl+backend {
                        set obj.ttl = 10m;
                }
        }
- }
+}
 
 client c1 {
        txreq -url "/2"
@@ -73,8 +70,6 @@ client c1 {
        expect resp.http.X-varnish == "1005"
 } -run
 
-server s1 -wait
-
 client c1 {
        txreq -url "/2"
        rxresp