- Cleanup ede.tdir test.

NLnetLabs · Jul 23, 2024 · 7d4d217 · 7d4d217
1 parent 83e6977
commit 7d4d217
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/doc/Changelog b/doc/Changelog
@@ -1,5 +1,6 @@
 23 July 2024: Yorgos
 	- Fix #1106: ratelimit-below-domain logs the wrong FROM address.
+	- Cleanup ede.tdir test.
 
 23 July 2024: Wouter
 	- Merge #1110: Make fallthrough explicit for libworker.c.

diff --git a/testdata/ede.tdir/ede-auth.conf b/testdata/ede.tdir/ede-auth.conf
@@ -24,4 +24,3 @@ auth-zone:
 auth-zone:
         name: "rrsig-failures.test"
         zonefile: "bogus/rrsig-failures.test.signed"
-
diff --git a/testdata/ede.tdir/ede.conf b/testdata/ede.tdir/ede.conf
@@ -33,18 +33,18 @@ server:
 	local-zone: test nodefault
 	do-not-query-localhost: no
 
-forward-zone:
+stub-zone:
 	name: "dnssec-failures.test"
-	forward-addr: 127.0.0.1@@PORT2@
+	stub-addr: 127.0.0.1@@PORT2@
 
-forward-zone:
+stub-zone:
 	name: "dnskey-failures.test"
-	forward-addr: 127.0.0.1@@PORT2@
+	stub-addr: 127.0.0.1@@PORT2@
 
-forward-zone:
+stub-zone:
 	name: "nsec-failures.test"
-	forward-addr: 127.0.0.1@@PORT2@
+	stub-addr: 127.0.0.1@@PORT2@
 
-forward-zone:
+stub-zone:
 	name: "rrsig-failures.test"
-	forward-addr: 127.0.0.1@@PORT2@
+	stub-addr: 127.0.0.1@@PORT2@
diff --git a/testdata/ede.tdir/ede.test b/testdata/ede.tdir/ede.test
@@ -5,9 +5,6 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
 
-# DNSSEC failure: Signature Expired or DNSKEY Missing (depending on the servfail configuration)
-dig @127.0.0.1 -p $UNBOUND_PORT servfail.nl > servfail.txt
-
 # DNSSEC failure: key not incepted
 dig @127.0.0.1 -p $UNBOUND_PORT notyetincepted.dnssec-failures.test. TXT +dnssec > sig_notyetincepted.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,3 @@ auth-zone:
		auth-zone:
		name: "rrsig-failures.test"
		zonefile: "bogus/rrsig-failures.test.signed"