[master] 135adfa Merge tests

[Federico G. Schwindt]

commit 135adfa84a96d46f444a8db1bb2f358b46822820
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sun Jan 15 23:11:37 2017 +0000

    Merge tests

diff --git a/bin/varnishtest/tests/b00023.vtc b/bin/varnishtest/tests/b00023.vtc
index d418904..9ee5ed3 100644
--- a/bin/varnishtest/tests/b00023.vtc
+++ b/bin/varnishtest/tests/b00023.vtc
@@ -1,15 +1,23 @@
-varnishtest "Check that the first_byte_timeout works from parameters"
+varnishtest "Check that the first_byte_timeout works"
 
 feature SO_RCVTIMEO_WORKS
 
+# From VCL
+
 server s1 {
 	rxreq
-	delay 1.5
-	txresp -body "foo"
+	delay 1
+	txresp
 } -start
 
-varnish v1 -vcl+backend {} -start
-varnish v1 -cliok "param.set first_byte_timeout 1"
+varnish v1 -vcl+backend {
+	sub vcl_recv {
+		return (pass);
+	}
+	sub vcl_backend_fetch {
+		set bereq.first_byte_timeout = 0.5s;
+	}
+} -start
 
 client c1 {
 	txreq
@@ -19,14 +27,65 @@ client c1 {
 
 server s1 {
 	rxreq
-	delay 0.5
-	txresp -body "foo"
+	delay 0.2
+	txresp
 } -start
 
-client c1 {
+client c2 {
 	txreq
 	rxresp
 	expect resp.status == 200
 } -run
 
-varnish v1 -expect fetch_failed == 1
+# From CLI
+
+varnish v1 -vcl+backend {
+	sub vcl_recv {
+		return (pass);
+	}
+}
+varnish v1 -cliok "param.set first_byte_timeout 0.5"
+
+server s1 {
+	rxreq
+	delay 1
+	txresp
+} -start
+
+client c1 -run
+
+server s1 {
+	rxreq
+	delay 0.2
+	txresp
+} -start
+
+client c2 -run
+
+# From backend definition
+
+server s1 {
+	rxreq
+	delay 1
+	txresp
+} -start
+
+varnish v1 -vcl {
+	backend b1 {
+		.host = "${s1_addr}";
+		.port = "${s1_port}";
+		.first_byte_timeout = 0.5s;
+	}
+}
+
+client c1 -run
+
+server s1 {
+	rxreq
+	delay 0.2
+	txresp
+} -start
+
+client c2 -run
+
+varnish v1 -expect fetch_failed == 3
diff --git a/bin/varnishtest/tests/b00024.vtc b/bin/varnishtest/tests/b00024.vtc
deleted file mode 100644
index 1a55153..0000000
--- a/bin/varnishtest/tests/b00024.vtc
+++ /dev/null
@@ -1,34 +0,0 @@
-varnishtest "Check that the first_byte_timeout works from vcl"
-
-feature SO_RCVTIMEO_WORKS
-
-server s1 {
-	rxreq
-	delay 1.5
-	txresp
-} -start
-
-varnish v1 -vcl+backend {
-	sub vcl_backend_fetch {
-		set bereq.first_byte_timeout = 1s;
-	}
-} -start
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 503
-} -run
-
-
-server s1 {
-	rxreq
-	delay 0.5
-	txresp
-} -start
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 200
-} -run
diff --git a/bin/varnishtest/tests/b00025.vtc b/bin/varnishtest/tests/b00025.vtc
deleted file mode 100644
index 05536ab..0000000
--- a/bin/varnishtest/tests/b00025.vtc
+++ /dev/null
@@ -1,39 +0,0 @@
-varnishtest "Check that the first_byte_timeout works from backend definition"
-
-feature SO_RCVTIMEO_WORKS
-
-server s1 {
-	rxreq
-	delay 1.5
-	txresp
-} -start
-
-varnish v1 -vcl {
-	backend b1 {
-		.host = "${s1_addr}";
-		.port = "${s1_port}";
-		.first_byte_timeout = 1s;
-	}
-} -start
-
-# Fragmenting storage tests for #1397
-varnish v1 -cliok "debug.fragfetch 4"
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 503
-} -run
-
-
-server s1 {
-	rxreq
-	delay 0.5
-	txresp
-} -start
-
-client c1 {
-	txreq
-	rxresp
-	expect resp.status == 200
-} -run