From: Philip Homburg <philip@nlnetlabs.nl>
Date: Tue, 14 Jun 2022 15:04:23 +0000 (+0200)
Subject: Avoid network traffic during test, a bit of cleanup
X-Git-Tag: release-1.16.1rc1~27^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8e111e379bf454c46c0aeac9bb4e026c2c41ead;p=thirdparty%2Funbound.git

Avoid network traffic during test, a bit of cleanup
---

diff --git a/testdata/blanks_cached_zone.tdir/blanks.example.com b/testdata/blanks_cached_zone.tdir/blanks.example.com.zone
similarity index 100%
rename from testdata/blanks_cached_zone.tdir/blanks.example.com
rename to testdata/blanks_cached_zone.tdir/blanks.example.com.zone
diff --git a/testdata/blanks_cached_zone.tdir/blanks_cached_zone.conf b/testdata/blanks_cached_zone.tdir/blanks_cached_zone.conf
index c3d43b79f..b0eb4aa9a 100644
--- a/testdata/blanks_cached_zone.tdir/blanks_cached_zone.conf
+++ b/testdata/blanks_cached_zone.tdir/blanks_cached_zone.conf
@@ -14,12 +14,7 @@ server:
 
 auth-zone:
         name: blanks.example.com
-        zonefile: "blanks.example.com"
-	url: "https://www.example.com/blanks.example.com.zone"
+        zonefile: "blanks.example.com.zone"
+	url: "https://127.0.0.1:@TOPORT@/blanks.example.com.zone"
 	for-upstream: yes
 	for-downstream: yes
-
-#rpz:
-#        name: blanks.example.com
-#        zonefile: "blanks.example.com"
-#	url: "https://127.0.0.1:@TOPORT@/blanks.example.com.zone"
diff --git a/testdata/blanks_cached_zone.tdir/blanks_cached_zone.pre b/testdata/blanks_cached_zone.tdir/blanks_cached_zone.pre
index 4a9f69bd6..f347a66cc 100644
--- a/testdata/blanks_cached_zone.tdir/blanks_cached_zone.pre
+++ b/testdata/blanks_cached_zone.tdir/blanks_cached_zone.pre
@@ -8,10 +8,11 @@ PRE="../.."
 . ../common.sh
 get_random_port 2
 UNBOUND_PORT=$RND_PORT
+UNUSED_PORT=$(($RND_PORT + 1))
 echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
 
 # make config file
-sed -e 's/@PORT\@/'$UNBOUND_PORT'/' < blanks_cached_zone.conf > ub.conf
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UNUSED_PORT'/' < blanks_cached_zone.conf > ub.conf
 # start unbound in the background
 $PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
 UNBOUND_PID=$!