r3695 - branches/2.0/varnish-cache/bin/varnishtest/tests

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-09 13:06:18 +0100 (Mon, 09 Feb 2009)
New Revision: 3695

Modified:
   branches/2.0/varnish-cache/bin/varnishtest/tests/c00020.vtc
Log:
Merge r3505: Expand critbit test for more coverage



Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/c00020.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/c00020.vtc	2009-02-09 11:33:59 UTC (rev 3694)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/c00020.vtc	2009-02-09 12:06:18 UTC (rev 3695)
@@ -4,6 +4,7 @@
 
 server s1 {
         rxreq 
+	expect req.url == "/"
         txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
@@ -23,10 +24,38 @@
         expect resp.http.X-Varnish == "1002 1001"
 } -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
+server s1 {
+        rxreq 
+	expect req.url == "/foo"
+        txresp -body "012345\n"
+        rxreq 
+	expect req.url == "/bar"
+        txresp -body "012345\n"
+} -start
+
+client c2 {
+        txreq -url "/foo"
+        rxresp
+        expect resp.status == 200
+        expect resp.http.X-Varnish == "1003"
+        txreq -url "/"
+        rxresp
+        expect resp.status == 200
+        expect resp.http.X-Varnish == "1004 1001"
+        txreq -url "/bar"
+        rxresp
+        expect resp.status == 200
+        expect resp.http.X-Varnish == "1005"
+        txreq -url "/foo"
+        rxresp
+        expect resp.status == 200
+        expect resp.http.X-Varnish == "1006 1003"
+} -run
+
+varnish v1 -expect client_conn == 3
+varnish v1 -expect cache_hit == 3
+varnish v1 -expect cache_miss == 3
+varnish v1 -expect client_req == 6
+varnish v1 -expect s_sess == 3
+varnish v1 -expect s_req == 6
+varnish v1 -expect s_fetch == 3