Check counters to make sure the right thing happens.

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

diff --git a/varnish-cache/bin/varnishtest/tests/v00004.vtc b/varnish-cache/bin/varnishtest/tests/v00004.vtc
index 4e4f7bf8d2a4020c562594a618b4fa2709e3ad41..04a05ec896670a7b002cf30b9e5671b43306c308 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/v00004.vtc
+++ b/varnish-cache/bin/varnishtest/tests/v00004.vtc
@@ -6,10 +6,11 @@ varnish v1 -vcl {
        backend b1 {
                .host = "127.0.0.1";
        }
-} -start
+}
 
 varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
+varnish v1 -start
+varnish v1 -expect n_backend == 1
 
 varnish v1 -vcl {
        backend b1 {
@@ -17,8 +18,9 @@ varnish v1 -vcl {
        }
 }
 
-varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
+varnish v1 -expect n_backend == 1
+varnish v1 -expect n_vcl == 2
+
 
 varnish v1 -vcl {
        backend b2 {
@@ -26,18 +28,20 @@ varnish v1 -vcl {
        }
 }
 
-varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
+varnish v1 -expect n_backend == 2
+varnish v1 -expect n_vcl == 3
+
 
 varnish v1 -cli "vcl.discard vcl1"
 
-varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
+varnish v1 -expect n_backend == 2
+varnish v1 -expect n_vcl == 2
 
 varnish v1 -cli "vcl.discard vcl2"
 
-varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
+varnish v1 -expect n_backend == 1
+varnish v1 -expect n_vcl == 1
+
 
 varnish v1 -vcl {
        backend b2 {
@@ -52,16 +56,15 @@ varnish v1 -vcl {
        }
 }
 
-varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
+varnish v1 -expect n_backend == 2
+varnish v1 -expect n_vcl == 2
 
 varnish v1 -cli "vcl.use vcl3"
 
-varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
+varnish v1 -expect n_backend == 2
+varnish v1 -expect n_vcl == 2
 
 varnish v1 -cli "vcl.discard vcl4"
 
-varnish v1 -cli vcl.list
-varnish v1 -cli debug.backend
-
+varnish v1 -expect n_backend == 1
+varnish v1 -expect n_vcl == 1