Be much more explicit about localhost.

Force varnish instance into /tmp/__${name}

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

diff --git a/varnish-cache/bin/varnishtest/tests/c00001.vtc b/varnish-cache/bin/varnishtest/tests/c00001.vtc
index b287a8f5a44cd6b083f5896ac0dfd01e896c0c87..ccbf65389d88ead896ce80aaacba17e4888f694e 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/c00001.vtc
+++ b/varnish-cache/bin/varnishtest/tests/c00001.vtc
@@ -8,7 +8,7 @@ server s1 {
                -hdr "Foobar: _barf_" \
                -hdr "Connection: close" \
                -body "012345\n"
-}
+} -start
 
 varnish v1 -vcl+backend { 
        sub vcl_fetch {
@@ -26,8 +26,6 @@ varnish v1 -vcl+backend {
        }
 } -start 
 
-server s1 -start 
-
 client c1 {
        txreq -url "/"
        rxresp
@@ -41,6 +39,4 @@ client c1 {
        expect resp.http.snafu5 == "_barffra\p_"
        # NB: have to escape the \\ in the next line
        expect resp.http.snafu6 == "_f&rap\\_"
-}
-
-client c1 -run
+} -run

diff --git a/varnish-cache/bin/varnishtest/tests/c00002.vtc b/varnish-cache/bin/varnishtest/tests/c00002.vtc
index ebcc6021be11c04a30619e4f0f29f1a16b2503b6..5edce31e653a430f106f227f94c88481d87e2980 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/c00002.vtc
+++ b/varnish-cache/bin/varnishtest/tests/c00002.vtc
@@ -2,25 +2,21 @@
 #
 # $Id$
 
-test "Check that multiple thread pools all get started"
-
-varnish v1 -arg "-b 127.0.0.1:9080 -p thread_pools=9" -start
+test "Check that all thread pools all get started and get minimum threads"
 
 server s1 {
        rxreq 
        txresp -hdr "Connection: close" -body "012345\n"
-}
+} -start
+
+varnish v1 -arg "-p thread_pool_min=2 -p thread_pools=4" -vcl+backend {} -start
 
-server s1 -start 
+delay 1
+varnish v1 -expect n_wrk_create == 8
 
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
-}
-
-client c1 -run
-
-server s1 -wait
+} -run
 
-varnish v1 -stop

diff --git a/varnish-cache/bin/varnishtest/tests/c00003.vtc b/varnish-cache/bin/varnishtest/tests/c00003.vtc
index e90e2c3743dd2178173939e983f2e11bf89557d5..0ef12a8cd41786c74b5a0e47706db43eb6526365 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/c00003.vtc
+++ b/varnish-cache/bin/varnishtest/tests/c00003.vtc
@@ -2,21 +2,20 @@
 #
 # $Id$
 
-test "Check that we start if one listen address works"
-
-varnish v1 -accept ":9081 127.0.0.2:9082" -arg "-b 127.0.0.1:9080"  -start
+test "Check that we start if at least one listen address works"
 
 server s1 {
        rxreq 
        txresp -hdr "Connection: close" -body "012345\n"
 } -start
 
+varnish v1 -cliok "param.set listen_address 127.0.0.2:9082"
+varnish v1 -vcl+backend {} -clierr 300 start
+varnish v1 -cliok "param.set listen_address :9081,127.0.0.2:9082"
+varnish v1 -start
+
 client c1 {
        txreq -url "/"
        rxresp
        expect resp.status == 200
 } -run
-
-server s1 -wait
-
-varnish v1 -stop

diff --git a/varnish-cache/bin/varnishtest/tests/c00004.vtc b/varnish-cache/bin/varnishtest/tests/c00004.vtc
index ea712102a2443211cd0030ab0529192768655145..2978ab34edb05a1ee4b493fd1f47eb18189629d5 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/c00004.vtc
+++ b/varnish-cache/bin/varnishtest/tests/c00004.vtc
@@ -49,6 +49,4 @@ client c1 {
        expect resp.http.X-Varnish == "1005 1001"
        expect resp.http.snafu == "1"
 
-}
-
-client c1 -run
+} -run

diff --git a/varnish-cache/bin/varnishtest/tests/c00005.vtc b/varnish-cache/bin/varnishtest/tests/c00005.vtc
index ae58a22d28d17e138d39a2f53a530c1cac5fbabc..fb7e78191d59bed7c4f3b0f5972fc1d516e30913 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/c00005.vtc
+++ b/varnish-cache/bin/varnishtest/tests/c00005.vtc
@@ -1,6 +1,6 @@
 # $Id$
 
-test "Test simple ACL (May fail on Linux)"
+test "Test simple ACL"
 
 server s1 {
        rxreq
@@ -27,9 +27,7 @@ client c1 {
        txreq -url "foo"
        rxresp
        expect resp.status == 200
-}
-
-client c1 -run
+} -run
 
 varnish v1 -vcl+backend {
        acl acl1 {

diff --git a/varnish-cache/bin/varnishtest/vtc_client.c b/varnish-cache/bin/varnishtest/vtc_client.c
index 746c1de9a99fc8db83a72bd696cf786dd8d277a4..632274a3626861d213eb2febe993d87e93bb6b04 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_client.c
+++ b/varnish-cache/bin/varnishtest/vtc_client.c
@@ -112,7 +112,7 @@ client_new(char *name)
                exit (1);
        }
 
-       c->connect = ":9081";
+       c->connect = "127.0.0.1:9081";
        VTAILQ_INSERT_TAIL(&clients, c, list);
        return (c);
 }

diff --git a/varnish-cache/bin/varnishtest/vtc_varnish.c b/varnish-cache/bin/varnishtest/vtc_varnish.c
index 3a65b5200dd365dcf5449d59921dc34d086dc1e2..bd7fccca400b8f42067b34064e5388147c835720 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_varnish.c
+++ b/varnish-cache/bin/varnishtest/vtc_varnish.c
@@ -148,8 +148,8 @@ varnish_new(char *name)
        }
 
        v->args = "";
-       v->telnet = ":9001";
-       v->accept = ":9081";
+       v->telnet = "127.0.0.1:9001";
+       v->accept = "127.0.0.1:9081";
        v->cli_fd = -1;
        VTAILQ_INSERT_TAIL(&varnishes, v, list);
        return (v);
@@ -191,7 +191,7 @@ varnish_launch(struct varnish *v)
        vsb = vsb_newauto();
        AN(vsb);
        vsb_printf(vsb, "cd ../varnishd &&");
-       vsb_printf(vsb, " ./varnishd -d -d -n %s", v->name);
+       vsb_printf(vsb, " ./varnishd -d -d -n /tmp/__%s", v->name);
        vsb_printf(vsb, " -a '%s' -T %s", v->accept, v->telnet);
        vsb_printf(vsb, " %s", v->args);
        vsb_finish(vsb);
@@ -235,8 +235,12 @@ varnish_launch(struct varnish *v)
        }
        vtc_log(v->vl, 3, "CLI connection fd = %d", v->cli_fd);
        assert(v->cli_fd >= 0);
-       v->stats = VSL_OpenStats(v->name);
-
+       vsb = vsb_newauto();
+       vsb_printf(vsb, "/tmp/__%s", v->name);
+       vsb_finish(vsb);
+       AZ(vsb_overflowed(vsb));
+       v->stats = VSL_OpenStats(vsb_data(vsb));
+       vsb_delete(vsb);
 }
 
 /**********************************************************************