[6.1] 0dbcb74a2 Eliminated varnishd from these tests

hermunn hermunn at varnish-software.com
Wed Oct 24 09:29:14 UTC 2018


commit 0dbcb74a2df98d87d17cbd726740c235a16db692
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 24 06:47:36 2018 +0000

    Eliminated varnishd from these tests

diff --git a/bin/varnishtest/tests/a00015.vtc b/bin/varnishtest/tests/a00015.vtc
index 843637f0f..f363d66d9 100644
--- a/bin/varnishtest/tests/a00015.vtc
+++ b/bin/varnishtest/tests/a00015.vtc
@@ -12,9 +12,7 @@ server s1 {
 	txresp -hdr "Content-Type: text/plain" -body response
 } -start
 
-varnish v1 -vcl+backend {} -start -cliok "param.set debug +syncvsl"
-
-client c1 {
+client c1 -connect ${s1_sock} {
 	txreq -req POST -hdr "Content-Type: text/plain" -body request
 
 	# First, HTTP checks
diff --git a/bin/varnishtest/tests/a00018.vtc b/bin/varnishtest/tests/a00018.vtc
index 036aa4596..5500d7c6e 100644
--- a/bin/varnishtest/tests/a00018.vtc
+++ b/bin/varnishtest/tests/a00018.vtc
@@ -8,28 +8,9 @@ server s1 {
 	txresp -hdr "Bar: ${bar}"
 } -start
 
-varnish v1 -vcl {
-	backend default {
-		.host = "${s1_addr}";
-		.port = "${s1_port}";
-	}
-
-	sub vcl_deliver {
-		if (resp.http.Bar == "${bar}") {
-			set resp.http.Baz = "${baz}";
-		}
-	}
-} -start
-
-client c1 {
+client c1 -connect ${s1_sock} {
 	txreq -hdr "Foo: ${foo}"
 	rxresp
 	expect resp.status == 200
 	expect resp.http.Bar == "${bar}"
-	expect resp.http.Baz == "${baz}"
 } -run
-
-shell {
-	touch ${tmpdir}/tst
-	rm ${tmpdir}/tst
-}


More information about the varnish-commit mailing list