- Cleanup ede.tdir test.

diff --git a/doc/Changelog b/doc/Changelog
index 16f9a276986b18d851031efd7730bb72cb2d33be..d8676d62a8ce05f6958e29fc25b77c639fd6cc6e 100644 (file)
--- 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
index d78da0382ad48570357c217613acf2026f490fbc..81a9f6bfa65fe5559fa48de17f625d9895529f1c 100644 (file)
--- 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
index 639899d13049ed705484a830123c70b7421f2401..1a9cc7e3016b33dd25263e12dc08ca8a3cbcb120 100644 (file)
--- 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
index e45085ebf1565807aa4fb4675722ca76e18b214b..d166b2e9a9c2d36452088c12e5802bd0eb667491 100644 (file)
--- 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