[7.4] 93f2e7516 vtc: Do not resolve localhost in test cases

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Jun 21 13:42:16 UTC 2024


commit 93f2e7516bdc055d122d5141642268e36a3759b0
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Jun 19 09:58:50 2024 +0200

    vtc: Do not resolve localhost in test cases

diff --git a/bin/varnishtest/tests/b00058.vtc b/bin/varnishtest/tests/b00058.vtc
index ba09916af..0b9afb73e 100644
--- a/bin/varnishtest/tests/b00058.vtc
+++ b/bin/varnishtest/tests/b00058.vtc
@@ -5,8 +5,8 @@ feature cmd {getent hosts localhost && getent services http}
 varnish v1 -arg "-p vcc_feature=-err_unref" -vcl {
 	backend b1 {.host = "127.0.0.1";}
 	backend b2 {.host = "[::1]:8080";}
-	backend b3 {.host = "localhost:8081";}
-	backend b4 {.host = "localhost:http";}
+	backend b3 {.host = "${localhost}:8081";}
+	backend b4 {.host = "${localhost}:http";}
 	backend b5 {.host = "127.0.0.1";.port = "8081";}
 	backend b6 {.host = "127.0.0.1";.port = "http";}
 }
diff --git a/bin/varnishtest/tests/p00000.vtc b/bin/varnishtest/tests/p00000.vtc
index e7a4219b4..d31177f73 100644
--- a/bin/varnishtest/tests/p00000.vtc
+++ b/bin/varnishtest/tests/p00000.vtc
@@ -3,7 +3,7 @@ varnishtest "Test Basic persistence"
 feature persistent_storage
 
 process p1 -dump {
-	varnishd -spersistent -b localhost -n ${tmpdir} -a :0 -d 2>&1
+	varnishd -spersistent -b ${localhost} -n ${tmpdir} -a :0 -d 2>&1
 } -start -expect-exit 1
 
 process p1 -expect-text 0 0 {to launch}
diff --git a/bin/varnishtest/tests/s00003.vtc b/bin/varnishtest/tests/s00003.vtc
index f186d8956..b15de012c 100644
--- a/bin/varnishtest/tests/s00003.vtc
+++ b/bin/varnishtest/tests/s00003.vtc
@@ -46,14 +46,14 @@ varnish v1 -vsl_catchup
 varnish v1 -cliok "ban obj.http.date ~ ."
 
 process p1 {
-	varnishd -sTransient=file,${tmpdir}/foo,xxx -blocalhost -a:0 -n ${tmpdir} 2>&1
+	varnishd -sTransient=file,${tmpdir}/foo,xxx -b${localhost} -a:0 -n ${tmpdir} 2>&1
 } -expect-exit 0x2 -dump -start -expect-text 0 0 "Invalid number" -wait -screen_dump
 
 process p1 {
-	varnishd -sTransient=file,${tmpdir}/foo,10M,xxx -blocalhost -a:0 -n ${tmpdir} 2>&1
+	varnishd -sTransient=file,${tmpdir}/foo,10M,xxx -b${localhost} -a:0 -n ${tmpdir} 2>&1
 } -expect-exit 0x2 -dump -start -expect-text 0 0 "granularity" -wait -screen_dump
 
 process p1 {
-	varnishd -sTransient=file,${tmpdir}/foo,10m,,foo -blocalhost -a:0 -n ${tmpdir} 2>&1
+	varnishd -sTransient=file,${tmpdir}/foo,10m,,foo -b${localhost} -a:0 -n ${tmpdir} 2>&1
 } -expect-exit 0x2 -dump -start -expect-text 0 0 "invalid advice" -wait
 


More information about the varnish-commit mailing list