[master] cd23a78 Move test to (d)irectors

[Federico G. Schwindt]

commit cd23a7867087e3c844939adfd2d707216218e7a0
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sun Nov 9 18:50:07 2014 +0000

    Move test to (d)irectors
    
    I'm not sure how valuable this test is but put it in the right place
    until it's decided.

diff --git a/bin/varnishtest/tests/d00006.vtc b/bin/varnishtest/tests/d00006.vtc
new file mode 100644
index 0000000..9d8ba1d
--- /dev/null
+++ b/bin/varnishtest/tests/d00006.vtc
@@ -0,0 +1,82 @@
+varnishtest "Test vmod.directors round robin director in stacked fashion"
+
+
+server s1 {
+	rxreq
+	txresp -body "1"
+} -start
+
+server s2 {
+	rxreq
+	txresp -body "22"
+} -start
+
+
+server s3 {
+	rxreq
+	txresp -body "333"
+} -start
+
+server s4 {
+	rxreq
+	txresp -body "4444"
+} -start
+
+varnish v1 -errvcl {Names of VCL objects cannot contain '-'} {
+	import ${vmod_directors};
+	backend b1 { .host = "127.0.0.1"; .port = "8080";}
+	sub vcl_init {
+		new rr1-xx = directors.round_robin();
+	}
+}
+
+varnish v1 -vcl+backend {
+
+	import ${vmod_directors};
+	sub vcl_init {
+		new rr1 = directors.round_robin();
+		rr1.add_backend(s1);
+		rr1.add_backend(s3);
+
+		new rr2 = directors.round_robin();
+		rr2.add_backend(s2);
+		rr2.add_backend(s4);
+
+		new rr3 = directors.round_robin();
+		rr3.add_backend(rr1.backend());
+		rr3.add_backend(rr2.backend());
+	}
+
+	sub vcl_backend_fetch {
+		set bereq.backend = rr3.backend();
+	}
+} -start
+
+client c1 {
+	timeout 3
+	txreq -url "/foo1"
+	rxresp
+	expect resp.bodylen == 1
+	txreq -url "/foo2"
+	rxresp
+	expect resp.bodylen == 2
+	txreq -url "/foo3"
+	rxresp
+	expect resp.bodylen == 3
+	txreq -url "/foo4"
+	rxresp
+	expect resp.bodylen == 4
+} -run
+
+server s1 -start
+server s2 -start
+
+client c2 {
+	timeout 3
+	txreq -url "/foo11"
+	rxresp
+	expect resp.bodylen == 1
+	txreq -url "/foo22"
+	rxresp
+	expect resp.bodylen == 2
+} -run
diff --git a/bin/varnishtest/tests/m00010.vtc b/bin/varnishtest/tests/m00010.vtc
deleted file mode 100644
index 9d8ba1d..0000000
--- a/bin/varnishtest/tests/m00010.vtc
+++ /dev/null
@@ -1,82 +0,0 @@
-varnishtest "Test vmod.directors round robin director in stacked fashion"
-
-
-server s1 {
-	rxreq
-	txresp -body "1"
-} -start
-
-server s2 {
-	rxreq
-	txresp -body "22"
-} -start
-
-
-server s3 {
-	rxreq
-	txresp -body "333"
-} -start
-
-server s4 {
-	rxreq
-	txresp -body "4444"
-} -start
-
-varnish v1 -errvcl {Names of VCL objects cannot contain '-'} {
-	import ${vmod_directors};
-	backend b1 { .host = "127.0.0.1"; .port = "8080";}
-	sub vcl_init {
-		new rr1-xx = directors.round_robin();
-	}
-}
-
-varnish v1 -vcl+backend {
-
-	import ${vmod_directors};
-	sub vcl_init {
-		new rr1 = directors.round_robin();
-		rr1.add_backend(s1);
-		rr1.add_backend(s3);
-
-		new rr2 = directors.round_robin();
-		rr2.add_backend(s2);
-		rr2.add_backend(s4);
-
-		new rr3 = directors.round_robin();
-		rr3.add_backend(rr1.backend());
-		rr3.add_backend(rr2.backend());
-	}
-
-	sub vcl_backend_fetch {
-		set bereq.backend = rr3.backend();
-	}
-} -start
-
-client c1 {
-	timeout 3
-	txreq -url "/foo1"
-	rxresp
-	expect resp.bodylen == 1
-	txreq -url "/foo2"
-	rxresp
-	expect resp.bodylen == 2
-	txreq -url "/foo3"
-	rxresp
-	expect resp.bodylen == 3
-	txreq -url "/foo4"
-	rxresp
-	expect resp.bodylen == 4
-} -run
-
-server s1 -start
-server s2 -start
-
-client c2 {
-	timeout 3
-	txreq -url "/foo11"
-	rxresp
-	expect resp.bodylen == 1
-	txreq -url "/foo22"
-	rxresp
-	expect resp.bodylen == 2
-} -run