Commit bdc3022dd6 for bind
commit bdc3022dd6f0a79b35d027982ee2af5869057532
Author: Štěpán Balážik <stepan@isc.org>
Date: Wed Sep 16 11:05:09 2026 +0200
Expect ans.run from every mock server by default
Every ans.py server writes ans.run, and every module and shared
artifact list had to allow for it one by one. List it with the common
artifacts instead. The modules that allowed for nothing else lose their
extra_artifacts marker and with it the artifact check, which only runs
for marked modules.
Assisted-by: Claude:claude-fable-5-1
diff --git a/bin/tests/system/camp/tests_sh_camp.py b/bin/tests/system/camp/tests_sh_camp.py
index 821e1ff0f6..11de830065 100644
--- a/bin/tests/system/camp/tests_sh_camp.py
+++ b/bin/tests/system/camp/tests_sh_camp.py
@@ -14,7 +14,6 @@ import pytest
pytestmark = pytest.mark.extra_artifacts(
[
"dig.out*",
- "ans*/ans.run",
"ns*/*.jnl",
"ns*/*tld*.db",
]
diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py
index 608de2e318..3a05b72fe2 100644
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -361,6 +361,7 @@ def logger(request, system_test_name):
def expected_artifacts(request):
common_artifacts = [
".libs/*", # possible build artifacts, see GL #5055
+ "ans*/ans.run",
"ans*/keys",
"ans*/zones",
"ns*/keys",
diff --git a/bin/tests/system/cookie/tests_sh_cookie.py b/bin/tests/system/cookie/tests_sh_cookie.py
index 34f5bcb33d..2aef0377b4 100644
--- a/bin/tests/system/cookie/tests_sh_cookie.py
+++ b/bin/tests/system/cookie/tests_sh_cookie.py
@@ -16,7 +16,6 @@ pytestmark = pytest.mark.extra_artifacts(
"dig.out.*",
"named.run.*",
"rndc.out.*",
- "ans*/ans.run",
"ans*/query.log",
"ns1/named_dump.db*",
"ns4/named.cookiealwaysvalid",
diff --git a/bin/tests/system/digdelv/common.py b/bin/tests/system/digdelv/common.py
index b2de433a6d..c7be636274 100644
--- a/bin/tests/system/digdelv/common.py
+++ b/bin/tests/system/digdelv/common.py
@@ -16,7 +16,6 @@ Helpers shared by the digdelv test modules.
import yaml
ARTIFACTS = [
- "ans*/ans.run",
"ns*/anchor.*",
"ns*/dsset-*",
"ns*/keydata",
diff --git a/bin/tests/system/dispatch/tests_connreset.py b/bin/tests/system/dispatch/tests_connreset.py
index af2c9b1202..b55fe46236 100644
--- a/bin/tests/system/dispatch/tests_connreset.py
+++ b/bin/tests/system/dispatch/tests_connreset.py
@@ -10,16 +10,9 @@
# information regarding copyright ownership.
import dns.message
-import pytest
import isctest
-pytestmark = pytest.mark.extra_artifacts(
- [
- "ans*/ans.run",
- ]
-)
-
def test_connreset():
msg = dns.message.make_query(
diff --git a/bin/tests/system/dispatch/tests_tcponly.py b/bin/tests/system/dispatch/tests_tcponly.py
index 4528b57c66..c03d94a63a 100644
--- a/bin/tests/system/dispatch/tests_tcponly.py
+++ b/bin/tests/system/dispatch/tests_tcponly.py
@@ -16,16 +16,9 @@ import dns.message
import dns.name
import dns.rdataclass
import dns.rdatatype
-import pytest
import isctest
-pytestmark = pytest.mark.extra_artifacts(
- [
- "ans*/ans.run",
- ]
-)
-
def _count_received(ans, qname, protocol):
pattern = Re(rf"Received {escape(qname)}/IN/A .* \({protocol}\)$")
diff --git a/bin/tests/system/dns64_dname/tests_dns64_dname.py b/bin/tests/system/dns64_dname/tests_dns64_dname.py
index be0a885e0c..76d1c41a07 100644
--- a/bin/tests/system/dns64_dname/tests_dns64_dname.py
+++ b/bin/tests/system/dns64_dname/tests_dns64_dname.py
@@ -16,8 +16,6 @@ import pytest
import isctest
-pytestmark = pytest.mark.extra_artifacts([])
-
def _answer_rrset(response, owner, rdtype):
rrset = response.get_rrset(
diff --git a/bin/tests/system/dnssec/tests_badkey.py b/bin/tests/system/dnssec/tests_badkey.py
index 4639ba792e..bff482b4e9 100644
--- a/bin/tests/system/dnssec/tests_badkey.py
+++ b/bin/tests/system/dnssec/tests_badkey.py
@@ -30,7 +30,6 @@ pytestmark = pytest.mark.extra_artifacts(
"*/*.key",
"*/*.signed",
"*/settime.out.*",
- "ans*/ans.run",
"*/trusted.keys",
"*/*.bad",
"*/*.next",
diff --git a/bin/tests/system/dnssec/tests_delv.py b/bin/tests/system/dnssec/tests_delv.py
index c3ae711c28..5043e88917 100644
--- a/bin/tests/system/dnssec/tests_delv.py
+++ b/bin/tests/system/dnssec/tests_delv.py
@@ -31,7 +31,6 @@ pytestmark = pytest.mark.extra_artifacts(
"*/*.key",
"*/*.signed",
"*/settime.out.*",
- "ans*/ans.run",
"*/trusted.keys",
"*/*.bad",
"*/*.next",
diff --git a/bin/tests/system/dnssec/tests_policy.py b/bin/tests/system/dnssec/tests_policy.py
index 611666bcd2..913c07c881 100644
--- a/bin/tests/system/dnssec/tests_policy.py
+++ b/bin/tests/system/dnssec/tests_policy.py
@@ -32,7 +32,6 @@ pytestmark = pytest.mark.extra_artifacts(
"*/*.key",
"*/*.signed",
"*/settime.out.*",
- "ans*/ans.run",
"*/trusted.keys",
"*/*.bad",
"*/*.next",
diff --git a/bin/tests/system/dnssec/tests_signing.py b/bin/tests/system/dnssec/tests_signing.py
index bfe16c7d08..a0f252eb78 100644
--- a/bin/tests/system/dnssec/tests_signing.py
+++ b/bin/tests/system/dnssec/tests_signing.py
@@ -38,7 +38,6 @@ pytestmark = pytest.mark.extra_artifacts(
"*/*.key",
"*/*.signed",
"*/settime.out.*",
- "ans*/ans.run",
"*/trusted.keys",
"*/*.bad",
"*/*.next",
diff --git a/bin/tests/system/dnssec/tests_tat.py b/bin/tests/system/dnssec/tests_tat.py
index 682ed34680..61f61f5549 100644
--- a/bin/tests/system/dnssec/tests_tat.py
+++ b/bin/tests/system/dnssec/tests_tat.py
@@ -32,7 +32,6 @@ pytestmark = pytest.mark.extra_artifacts(
"*/*.key",
"*/*.signed",
"*/settime.out.*",
- "ans*/ans.run",
"*/trusted.keys",
"*/*.bad",
"*/*.next",
diff --git a/bin/tests/system/dnssec/tests_validation.py b/bin/tests/system/dnssec/tests_validation.py
index 161f33e51b..9a560ffcf5 100644
--- a/bin/tests/system/dnssec/tests_validation.py
+++ b/bin/tests/system/dnssec/tests_validation.py
@@ -37,7 +37,6 @@ pytestmark = pytest.mark.extra_artifacts(
"*/*.key",
"*/*.signed",
"*/settime.out.*",
- "ans*/ans.run",
"*/trusted.keys",
"*/*.bad",
"*/*.next",
diff --git a/bin/tests/system/dnssec_nsec3/tests_dnssec_nsec3_delegation.py b/bin/tests/system/dnssec_nsec3/tests_dnssec_nsec3_delegation.py
index 74b7005c28..95e6222e78 100644
--- a/bin/tests/system/dnssec_nsec3/tests_dnssec_nsec3_delegation.py
+++ b/bin/tests/system/dnssec_nsec3/tests_dnssec_nsec3_delegation.py
@@ -40,7 +40,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/dnssec_nsec3/tests_nsec3_wrong_zone.py b/bin/tests/system/dnssec_nsec3/tests_nsec3_wrong_zone.py
index ea732fc3be..16a1e44a93 100644
--- a/bin/tests/system/dnssec_nsec3/tests_nsec3_wrong_zone.py
+++ b/bin/tests/system/dnssec_nsec3/tests_nsec3_wrong_zone.py
@@ -38,7 +38,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/dnssec_parent_rrsig/tests_parent_rrsig.py b/bin/tests/system/dnssec_parent_rrsig/tests_parent_rrsig.py
index 5b75e17620..ecc695a577 100644
--- a/bin/tests/system/dnssec_parent_rrsig/tests_parent_rrsig.py
+++ b/bin/tests/system/dnssec_parent_rrsig/tests_parent_rrsig.py
@@ -38,7 +38,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/dnssec_wildcard/tests_dnssec_wildcard_additional.py b/bin/tests/system/dnssec_wildcard/tests_dnssec_wildcard_additional.py
index f19b91d991..55b5fb26a8 100644
--- a/bin/tests/system/dnssec_wildcard/tests_dnssec_wildcard_additional.py
+++ b/bin/tests/system/dnssec_wildcard/tests_dnssec_wildcard_additional.py
@@ -29,7 +29,6 @@ RESOLVER = isctest.template.NS2.ip
pytestmark = [
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/dsset-*",
"ans*/keys/",
"ans*/zones/*.db",
diff --git a/bin/tests/system/dnssec_wildcard/tests_replayed_parent_wildcard.py b/bin/tests/system/dnssec_wildcard/tests_replayed_parent_wildcard.py
index baaf9cbdbf..f297a9996c 100644
--- a/bin/tests/system/dnssec_wildcard/tests_replayed_parent_wildcard.py
+++ b/bin/tests/system/dnssec_wildcard/tests_replayed_parent_wildcard.py
@@ -30,7 +30,6 @@ RESOLVER = isctest.template.NS2.ip
pytestmark = [
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/dsset-*",
"ans*/keys/",
"ans*/zones/*.db",
diff --git a/bin/tests/system/fetchlimit/tests_sh_fetchlimit.py b/bin/tests/system/fetchlimit/tests_sh_fetchlimit.py
index 1c68ed714e..f2f37a954a 100644
--- a/bin/tests/system/fetchlimit/tests_sh_fetchlimit.py
+++ b/bin/tests/system/fetchlimit/tests_sh_fetchlimit.py
@@ -15,7 +15,6 @@ pytestmark = pytest.mark.extra_artifacts(
[
"dig.out.*",
"wait_for_message.*",
- "ans*/ans.run",
"ns3/named.stats",
"ns3/named.stats.prev",
"ns5/named.stats",
diff --git a/bin/tests/system/filters/common.py b/bin/tests/system/filters/common.py
index d9411c46bb..cade025568 100644
--- a/bin/tests/system/filters/common.py
+++ b/bin/tests/system/filters/common.py
@@ -22,7 +22,6 @@ ARTIFACTS = [
"ns*/K*",
"ns*/dsset-*",
"ns*/signer.err",
- "ans*/ans.run",
]
diff --git a/bin/tests/system/forward/tests_sh_forward.py b/bin/tests/system/forward/tests_sh_forward.py
index 7c17575431..287a6d47c5 100644
--- a/bin/tests/system/forward/tests_sh_forward.py
+++ b/bin/tests/system/forward/tests_sh_forward.py
@@ -15,7 +15,6 @@ pytestmark = pytest.mark.extra_artifacts(
[
"dig.out.*",
"statschannel.out.*",
- "ans*/ans.run",
"ns*/trusted.conf",
"ns1/K*",
"ns1/dsset-*",
diff --git a/bin/tests/system/ixfr/tests_sh_ixfr.py b/bin/tests/system/ixfr/tests_sh_ixfr.py
index c6188d46ff..904f928b0f 100644
--- a/bin/tests/system/ixfr/tests_sh_ixfr.py
+++ b/bin/tests/system/ixfr/tests_sh_ixfr.py
@@ -15,7 +15,6 @@ pytestmark = pytest.mark.extra_artifacts(
[
"dig.out*",
"stats.*",
- "ans*/ans.run",
"ns*/*.jnl",
"ns1/named.run.prev*",
"ns1/myftp.db",
diff --git a/bin/tests/system/mismatchtcp/tests_mismatchtcp.py b/bin/tests/system/mismatchtcp/tests_mismatchtcp.py
index 5cb80e365f..67fa13f2ac 100644
--- a/bin/tests/system/mismatchtcp/tests_mismatchtcp.py
+++ b/bin/tests/system/mismatchtcp/tests_mismatchtcp.py
@@ -29,7 +29,6 @@ import isctest
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ns*/named.stats*",
]
)
diff --git a/bin/tests/system/nsec3/common.py b/bin/tests/system/nsec3/common.py
index 70b073e1f9..1d8e7fd11b 100644
--- a/bin/tests/system/nsec3/common.py
+++ b/bin/tests/system/nsec3/common.py
@@ -37,7 +37,6 @@ NSEC3_MARK = pytest.mark.extra_artifacts(
"ns*/*.signed",
"ns*/keygen.out.*",
"ns3/named-*.conf",
- "ans*/ans.run",
]
)
diff --git a/bin/tests/system/nsec3_impersonation/tests_nsec3_impersonation.py b/bin/tests/system/nsec3_impersonation/tests_nsec3_impersonation.py
index d21dc926f9..eb29aed3b1 100644
--- a/bin/tests/system/nsec3_impersonation/tests_nsec3_impersonation.py
+++ b/bin/tests/system/nsec3_impersonation/tests_nsec3_impersonation.py
@@ -36,7 +36,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/nsec_grandparent/tests_nsec_grandparent.py b/bin/tests/system/nsec_grandparent/tests_nsec_grandparent.py
index 80856d9be9..3f512636db 100644
--- a/bin/tests/system/nsec_grandparent/tests_nsec_grandparent.py
+++ b/bin/tests/system/nsec_grandparent/tests_nsec_grandparent.py
@@ -88,7 +88,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/nsec_piggyback/tests_nsec_piggyback.py b/bin/tests/system/nsec_piggyback/tests_nsec_piggyback.py
index f1b1890634..431879a622 100644
--- a/bin/tests/system/nsec_piggyback/tests_nsec_piggyback.py
+++ b/bin/tests/system/nsec_piggyback/tests_nsec_piggyback.py
@@ -45,7 +45,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
"ns2/managed-keys.bind.jnl",
]
diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py b/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py
index f4be9f1b80..6544b4f0cb 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py
@@ -39,7 +39,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py b/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py
index f6e4d8f31d..96d7e97471 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py
@@ -36,7 +36,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py b/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py
index 51591d9f29..86d16bcb52 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py
@@ -37,7 +37,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py b/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py
index f6514686f9..47383aa4b2 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py
@@ -31,7 +31,6 @@ RESOLVER = "10.53.0.2"
pytestmark = pytest.mark.extra_artifacts(
[
- "ans1/ans.run",
"ns3/K*",
"ns3/child.f007.test.db",
"ns3/child.f007.test.db.signed",
diff --git a/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py b/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py
index 74d530a886..f59f67fa9f 100644
--- a/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py
+++ b/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py
@@ -41,7 +41,6 @@ pytestmark = [
isctest.mark.with_ecdsa_deterministic,
pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/keys.json",
]
),
diff --git a/bin/tests/system/nsupdate/tests_sh_nsupdate.py b/bin/tests/system/nsupdate/tests_sh_nsupdate.py
index 86a370fbe7..e8163a00b1 100644
--- a/bin/tests/system/nsupdate/tests_sh_nsupdate.py
+++ b/bin/tests/system/nsupdate/tests_sh_nsupdate.py
@@ -31,7 +31,6 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
"typelist.out.*",
"update.in.*",
"verylarge",
- "ans*/ans.run",
"ns*/*.jnl",
"ns*/*.jnl",
"ns1/auth.sock",
diff --git a/bin/tests/system/nsupdate/tests_update_sig.py b/bin/tests/system/nsupdate/tests_update_sig.py
index 397a29f64e..508f2af012 100644
--- a/bin/tests/system/nsupdate/tests_update_sig.py
+++ b/bin/tests/system/nsupdate/tests_update_sig.py
@@ -46,7 +46,6 @@ import isctest
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ns*/*.bk",
"ns*/*.conf",
"ns*/*.db",
diff --git a/bin/tests/system/pipelined/tests_sh_pipelined.py b/bin/tests/system/pipelined/tests_sh_pipelined.py
index 48efd7c020..646d7a1647 100644
--- a/bin/tests/system/pipelined/tests_sh_pipelined.py
+++ b/bin/tests/system/pipelined/tests_sh_pipelined.py
@@ -16,7 +16,6 @@ pytestmark = pytest.mark.extra_artifacts(
"output*",
"pipequeries.err*",
"raw*",
- "ans*/ans.run",
]
)
diff --git a/bin/tests/system/qmin/tests_sh_qmin.py b/bin/tests/system/qmin/tests_sh_qmin.py
index c894e4210e..66f4624cb8 100644
--- a/bin/tests/system/qmin/tests_sh_qmin.py
+++ b/bin/tests/system/qmin/tests_sh_qmin.py
@@ -16,7 +16,6 @@ pytestmark = pytest.mark.extra_artifacts(
"dig.out.*",
"named.run.*",
"query*.log",
- "ans*/ans.run",
"ans*/query.log*",
]
)
diff --git a/bin/tests/system/qpcache_rrsig_any/tests_qpcache_rrsig_any.py b/bin/tests/system/qpcache_rrsig_any/tests_qpcache_rrsig_any.py
index 660234af69..ac42a7cb1c 100644
--- a/bin/tests/system/qpcache_rrsig_any/tests_qpcache_rrsig_any.py
+++ b/bin/tests/system/qpcache_rrsig_any/tests_qpcache_rrsig_any.py
@@ -23,7 +23,6 @@ import isctest
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ns*/named.run",
]
)
diff --git a/bin/tests/system/reclimit/tests_sh_reclimit.py b/bin/tests/system/reclimit/tests_sh_reclimit.py
index 5c304203f0..06c359673f 100644
--- a/bin/tests/system/reclimit/tests_sh_reclimit.py
+++ b/bin/tests/system/reclimit/tests_sh_reclimit.py
@@ -18,7 +18,6 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
"dig.out.*",
"dsset-signed.",
"ans*/ans.limit",
- "ans*/ans.run",
"ns1/K*",
"ns1/signed.db",
"ns1/signed.db.signed",
diff --git a/bin/tests/system/resolver/tests_sh_resolver.py b/bin/tests/system/resolver/tests_sh_resolver.py
index 0706cc5e03..77d3536e75 100644
--- a/bin/tests/system/resolver/tests_sh_resolver.py
+++ b/bin/tests/system/resolver/tests_sh_resolver.py
@@ -19,7 +19,6 @@ pytestmark = pytest.mark.extra_artifacts(
"dig.*.bar.*",
"dig.*.prime.*",
"nextpart.out.*",
- "ans*/ans.run",
"ans*/query.log",
"ns1/named.stats*",
"ns4/tld.db",
diff --git a/bin/tests/system/rpzrecurse/tests_sh_rpzrecurse.py b/bin/tests/system/rpzrecurse/tests_sh_rpzrecurse.py
index 853a128363..d5de64241f 100644
--- a/bin/tests/system/rpzrecurse/tests_sh_rpzrecurse.py
+++ b/bin/tests/system/rpzrecurse/tests_sh_rpzrecurse.py
@@ -16,7 +16,6 @@ pytestmark = pytest.mark.extra_artifacts(
"dig.out.*",
"dnsrps.cache",
"dnsrps.conf",
- "ans*/ans.run",
"ns2/*.queries",
"ns2/*.local",
"ns2/named.*.conf",
diff --git a/bin/tests/system/selftest_asyncdnsserver/tests_asyncserver_dnssec.py b/bin/tests/system/selftest_asyncdnsserver/tests_asyncserver_dnssec.py
index e9fb0ef256..5f0ac2507e 100644
--- a/bin/tests/system/selftest_asyncdnsserver/tests_asyncserver_dnssec.py
+++ b/bin/tests/system/selftest_asyncdnsserver/tests_asyncserver_dnssec.py
@@ -15,14 +15,11 @@ AsyncDnsServer responses built from zone data
import dns.message
import dns.rdatatype
-import pytest
from isctest.template import ANS1
import isctest
-pytestmark = pytest.mark.extra_artifacts(["ans*/ans.run"])
-
def query(qname: str, qtype: str, dnssec: bool = False) -> dns.message.Message:
msg = isctest.query.create(qname, qtype, dnssec=dnssec, rd=False)
diff --git a/bin/tests/system/selftest_asyncdnsserver/tests_empty_non_terminal.py b/bin/tests/system/selftest_asyncdnsserver/tests_empty_non_terminal.py
index c73d1ae4e1..832698cdf9 100644
--- a/bin/tests/system/selftest_asyncdnsserver/tests_empty_non_terminal.py
+++ b/bin/tests/system/selftest_asyncdnsserver/tests_empty_non_terminal.py
@@ -43,7 +43,6 @@ import isctest.zone
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ans*/dsset-*",
"ans*/zones/*.db",
"ans*/zones/*.db.signed",
diff --git a/bin/tests/system/serve_stale/tests_serve_stale_ncache.py b/bin/tests/system/serve_stale/tests_serve_stale_ncache.py
index 2248e18bdd..9871b3a801 100644
--- a/bin/tests/system/serve_stale/tests_serve_stale_ncache.py
+++ b/bin/tests/system/serve_stale/tests_serve_stale_ncache.py
@@ -27,7 +27,6 @@ import isctest
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ns*/root.bk",
]
)
diff --git a/bin/tests/system/serve_stale/tests_serve_stale_tcp.py b/bin/tests/system/serve_stale/tests_serve_stale_tcp.py
index fe668b4223..bdf77b02c9 100644
--- a/bin/tests/system/serve_stale/tests_serve_stale_tcp.py
+++ b/bin/tests/system/serve_stale/tests_serve_stale_tcp.py
@@ -26,7 +26,6 @@ import isctest
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ns*/root.bk",
]
)
diff --git a/bin/tests/system/serve_stale/tests_sh_serve_stale.py b/bin/tests/system/serve_stale/tests_sh_serve_stale.py
index 523d85548c..0f436e49b1 100644
--- a/bin/tests/system/serve_stale/tests_sh_serve_stale.py
+++ b/bin/tests/system/serve_stale/tests_sh_serve_stale.py
@@ -17,7 +17,6 @@ EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
"expired.test*",
"named_dump.db.test*",
"rndc.out.*",
- "ans*/ans.run",
"ns*/named.stats*",
"ns*/named_dump*",
"ns*/root.bk",
diff --git a/bin/tests/system/statistics/tests_sh_statistics.py b/bin/tests/system/statistics/tests_sh_statistics.py
index 31eae83167..0ff31d9380 100644
--- a/bin/tests/system/statistics/tests_sh_statistics.py
+++ b/bin/tests/system/statistics/tests_sh_statistics.py
@@ -18,7 +18,6 @@ pytestmark = pytest.mark.extra_artifacts(
"named.stats.*",
"stats.xml.out",
"xsltproc.out.*",
- "ans*/ans.run",
"ns*/statistics-channels.conf",
"ns*/named.recursing",
]
diff --git a/bin/tests/system/statschannel/tests_json.py b/bin/tests/system/statschannel/tests_json.py
index cad84af796..28523b3ded 100644
--- a/bin/tests/system/statschannel/tests_json.py
+++ b/bin/tests/system/statschannel/tests_json.py
@@ -22,7 +22,6 @@ pytestmark = [
isctest.mark.with_json_c,
pytest.mark.extra_artifacts(
[
- "ans5/ans.run",
"ns2/*.jnl",
"ns2/*.signed",
"ns2/dsset-*",
diff --git a/bin/tests/system/statschannel/tests_sh_statschannel.py b/bin/tests/system/statschannel/tests_sh_statschannel.py
index fc6c26392e..f1a70c76d7 100644
--- a/bin/tests/system/statschannel/tests_sh_statschannel.py
+++ b/bin/tests/system/statschannel/tests_sh_statschannel.py
@@ -16,7 +16,6 @@ import isctest.mark
EXTRA_ARTIFACTS = pytest.mark.extra_artifacts(
[
"K*",
- "ans5/ans.run",
"bind9.xsl.1",
"bind9.xsl.2",
"compressed.headers",
diff --git a/bin/tests/system/statschannel/tests_xml.py b/bin/tests/system/statschannel/tests_xml.py
index f4bd30e97f..c80a4b5bce 100644
--- a/bin/tests/system/statschannel/tests_xml.py
+++ b/bin/tests/system/statschannel/tests_xml.py
@@ -25,7 +25,6 @@ pytestmark = [
pytest.mark.extra_artifacts(
[
"ns2/K*",
- "ans5/ans.run",
"ns2/*.jnl",
"ns2/*.signed",
"ns2/dsset-*",
diff --git a/bin/tests/system/tkey/tests_cve_2026_3119.py b/bin/tests/system/tkey/tests_cve_2026_3119.py
index 5388900c04..4e281dd5c5 100644
--- a/bin/tests/system/tkey/tests_cve_2026_3119.py
+++ b/bin/tests/system/tkey/tests_cve_2026_3119.py
@@ -19,12 +19,9 @@ import dns.rdatatype
import dns.rdtypes.ANY.TKEY
import dns.rrset
import dns.tsigkeyring
-import pytest
import isctest
-pytestmark = pytest.mark.extra_artifacts([])
-
def create_tkey_msg(qname, mode, alg="hmac-sha256"):
msg = dns.message.make_query(qname, "TKEY")
diff --git a/bin/tests/system/tools/tests_sh_tools.py b/bin/tests/system/tools/tests_sh_tools.py
index 1bb527b43d..be6fdb6ea2 100644
--- a/bin/tests/system/tools/tests_sh_tools.py
+++ b/bin/tests/system/tools/tests_sh_tools.py
@@ -9,10 +9,6 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
-import pytest
-
-pytestmark = pytest.mark.extra_artifacts([])
-
def test_tools(run_tests_sh):
run_tests_sh()
diff --git a/bin/tests/system/tsig/tests_badtime.py b/bin/tests/system/tsig/tests_badtime.py
index 7df79465db..ffcc5c6beb 100644
--- a/bin/tests/system/tsig/tests_badtime.py
+++ b/bin/tests/system/tsig/tests_badtime.py
@@ -20,7 +20,6 @@ import pytest
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ns1/named-fips.conf",
]
)
diff --git a/bin/tests/system/tsig/tests_sh_tsig.py b/bin/tests/system/tsig/tests_sh_tsig.py
index 19063fece0..cdfc21f9a5 100644
--- a/bin/tests/system/tsig/tests_sh_tsig.py
+++ b/bin/tests/system/tsig/tests_sh_tsig.py
@@ -16,7 +16,6 @@ pytestmark = pytest.mark.extra_artifacts(
"dig.out.*",
"keygen.out*",
"packet.out",
- "ans*/ans.run",
"ns1/named-fips.conf",
]
)
diff --git a/bin/tests/system/tsig/tests_tsig_hypothesis.py b/bin/tests/system/tsig/tests_tsig_hypothesis.py
index 2e3125b41f..5786acdbc0 100644
--- a/bin/tests/system/tsig/tests_tsig_hypothesis.py
+++ b/bin/tests/system/tsig/tests_tsig_hypothesis.py
@@ -34,7 +34,6 @@ import isctest
pytestmark = pytest.mark.extra_artifacts(
[
- "ans*/ans.run",
"ns1/named-fips.conf",
]
)
diff --git a/bin/tests/system/upforwd/tests_sh_upforwd.py b/bin/tests/system/upforwd/tests_sh_upforwd.py
index f9edacfe03..b2b9887f7b 100644
--- a/bin/tests/system/upforwd/tests_sh_upforwd.py
+++ b/bin/tests/system/upforwd/tests_sh_upforwd.py
@@ -19,7 +19,6 @@ pytestmark = pytest.mark.extra_artifacts(
"dnstapread.out*",
"keyname*",
"nsupdate.out.*",
- "ans*/ans.run",
"ns*/*.bk",
"ns*/*.jnl",
"ns1/example.db",
diff --git a/bin/tests/system/zero/tests_sh_zero.py b/bin/tests/system/zero/tests_sh_zero.py
index 799198778b..e05bb44f1c 100644
--- a/bin/tests/system/zero/tests_sh_zero.py
+++ b/bin/tests/system/zero/tests_sh_zero.py
@@ -15,7 +15,6 @@ pytestmark = pytest.mark.extra_artifacts(
[
"dig.out*",
"query.list",
- "ans*/ans.run",
"ns2/example.db",
"ns4/example.bk",
]