Replace clean.sh files with extra_artifacts mark

The artifact lists in clean.sh and extra_artifacts might be slightly
different. The list was updated for each test to reflect the current
state.

(cherry picked from commit 7c259fe254)

bin/tests/system/acl/clean.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after zone transfer tests.
-#
-
-rm -f dig.out.*
-rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run
-rm -f ns*/named.lock
-rm -f ns*/_default.nzf
-rm -f ns*/_default.nzd*
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/acl/tests_sh_acl.py

@@ -9,6 +9,18 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out*",
+        "ns*/_default.nzd*",
+        "ns*/_default.nzf*",
+        "ns2/example.db",
+        "ns2/tsigzone.db",
+    ]
+)
+
 
 def test_acl(run_tests_sh):
     run_tests_sh()

bin/tests/system/additional/clean.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after tests.
-#
-
-rm -f dig.out.*
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/additional/tests_sh_additional.py

@@ -9,6 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+    ]
+)
+
 
 def test_additional(run_tests_sh):
     run_tests_sh()

bin/tests/system/addzone/clean.sh

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ./dig.out.*
-rm -f ./rndc.out*
-rm -f ./showzone.out*
-rm -f ./zonestatus.out*
-rm -f ./*/named.conf
-rm -f ./*/named.memstats
-rm -f ./ns1/*.nzf ./ns1/*.nzf~
-rm -f ./ns1/*.nzd ./ns1/*.nzd-lock
-rm -f ./ns2/*.nzf ./ns2/*.nzf~
-rm -f ./ns2/*.nzd ./ns2/*.nzd-lock
-rm -f ./ns3/*.nzf ./ns3/*.nzf~
-rm -f ./ns3/*.nzd ./ns3/*.nzd-lock
-rm -f ./ns2/core*
-rm -f ./ns2/inline.db.jbk
-rm -f ./ns2/inline.db.signed
-rm -f ./ns2/inlinesec.bk*
-rm -rf ./ns2/new-zones
-rm -f ./ns*/named.lock
-rm -f ./ns*/named.run ./ns*/named.run.prev
-rm -f ./ns2/nzf-*
-rm -f ./ns3/named.conf
-rm -f ./ns3/*.nzf ./ns3/*.nzf~
-rm -f ./ns3/*.nzd ns3/*.nzd-lock
-rm -f ./ns3/inlinesec.db
-rm -f ./ns1/redirect.db
-rm -f ./ns2/redirect.db
-rm -f ./ns2/redirect.bk
-rm -f ./ns3/redirect.db
-rm -f ./ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ./nzd2nzf.out.*
-rm -f ./wait_for_message.*

bin/tests/system/addzone/tests_rndc_deadlock.py

@@ -12,8 +12,21 @@
 import concurrent.futures
 import time
 
+import pytest
+
 import isctest
 
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "ns*/*.nzf*",
+        "ns*/*.nzd*",
+        "ns1/redirect.db",
+        "ns2/new-zones",
+        "ns2/redirect.db",
+        "ns3/redirect.db",
+    ]
+)
+
 
 def rndc_loop(test_state, domain, ns3):
     """

bin/tests/system/addzone/tests_sh_addzone.py

@@ -9,6 +9,35 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "rndc.out*",
+        "showzone.out.*",
+        "zonestatus.out.*",
+        "ns*/*.nzd*",
+        "ns*/*.nzf*",
+        "ns1/redirect.db",
+        "nzd2nzf.out.*",
+        "ns2/*.nzf~",
+        "ns2/K*.key",
+        "ns2/K*.private",
+        "ns2/K*.state",
+        "ns2/external.nzd",
+        "ns2/extra.nzd",
+        "ns2/inline.db.jbk",
+        "ns2/inline.db.signed",
+        "ns2/inline.db.signed.jnl",
+        "ns2/inlinesec.bk.jbk",
+        "ns2/new-zones",
+        "ns2/redirect.bk",
+        "ns2/redirect.db",
+        "ns3/redirect.db",
+    ]
+)
+
 
 def test_addzone(run_tests_sh):
     run_tests_sh()

bin/tests/system/allow-query/clean.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after allow query tests.
-#
-
-rm -f dig.out.*
-rm -f ns*/named.conf
-rm -f ns2/controls.conf
-rm -f */named.memstats
-rm -f ns*/named.lock
-rm -f ns*/named.run ns*/named.run.prev
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/allow-query/tests_sh_allow_query.py

@@ -9,6 +9,15 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "ns2/controls.conf",
+    ]
+)
+
 
 def test_allow_query(run_tests_sh):
     run_tests_sh()

bin/tests/system/auth/clean.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */named.memstats
-rm -f */named.run
-rm -f */named.conf
-rm -f dig.out.test*
-rm -f ns2/example.com.bk
-rm -f ns2/example.net.bk
-rm -f ns*/managed-keys.bind* ns*/*mkeys*

bin/tests/system/auth/tests_sh_auth.py

@@ -9,6 +9,15 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.test*",
+        "ns*/example.*.bk",
+    ]
+)
+
 
 def test_auth(run_tests_sh):
     run_tests_sh()

bin/tests/system/autosign/clean.sh

@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */K* */dsset-* */*.signed */tmp* */*.jnl */*.bk
-rm -f */core
-rm -f */example.bk
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run*
-rm -f */trusted.conf */private.conf
-rm -f activate-now-publish-1day.key
-rm -f active.key inact.key del.key delzsk.key unpub.key standby.key rev.key
-rm -f delayksk.key delayzsk.key autoksk.key autozsk.key
-rm -f dig.out.*
-rm -f digcomp.out.test*
-rm -f noksk-ksk.key nozsk-ksk.key nozsk-zsk.key inaczsk-zsk.key inaczsk-ksk.key
-rm -f nopriv.key vanishing.key del1.key del2.key
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
-rm -f ns1/root.db
-rm -f ns2/example.db
-rm -f ns2/optout-with-ent.db
-rm -f ns2/private.secure.example.db ns2/bar.db
-rm -f ns3/*.nzd ns3/*.nzd-lock ns3/*.nzf
-rm -f ns3/*.nzf
-rm -f ns3/autonsec3.example.db
-rm -f ns3/cdnskey-delete.example.db
-rm -f ns3/cds-delete.example.db
-rm -f ns3/delzsk.example.db
-rm -f ns3/dname-at-apex-nsec3.example.db
-rm -f ns3/inacksk2.example.db
-rm -f ns3/inacksk3.example.db
-rm -f ns3/inaczsk2.example.db
-rm -f ns3/inaczsk3.example.db
-rm -f ns3/jitter.nsec3.example.db
-rm -f ns3/kg.out ns3/s.out ns3/st.out
-rm -f ns3/kskonly.example.db
-rm -f ns3/named.ns3.prev
-rm -f ns3/noksk.example.db
-rm -f ns3/nozsk.example.db ns3/inaczsk.example.db
-rm -f ns3/nsec-only.example.db
-rm -f ns3/nsec3-to-nsec.example.db
-rm -f ns3/nsec3.example.db
-rm -f ns3/nsec3.nsec3.example.db
-rm -f ns3/nsec3.optout.example.db
-rm -f ns3/oldsigs.example.db
-rm -f ns3/optout.example.db
-rm -f ns3/optout.nsec3.example.db
-rm -f ns3/optout.optout.example.db
-rm -f ns3/prepub.example.db
-rm -f ns3/prepub.example.db.in
-rm -f ns3/reconf.example.db
-rm -f ns3/rsasha256.example.db ns3/rsasha512.example.db
-rm -f ns3/secure-to-insecure.example.db
-rm -f ns3/secure-to-insecure2.example.db
-rm -f ns3/secure.example.db
-rm -f ns3/secure.nsec3.example.db
-rm -f ns3/secure.optout.example.db
-rm -f ns3/settime.out.*
-rm -f ns3/sync.example.db
-rm -f ns3/ttl*.db
-rm -f nsupdate.out
-rm -f settime.out.*
-rm -f signing.out.*
-rm -f sync.key

bin/tests/system/autosign/tests_sh_autosign.py

@@ -9,9 +9,143 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
 
 import isctest.mark
 
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "active.key",
+        "activate-now-publish-1day.key",
+        "autoksk.key",
+        "autozsk.key",
+        "del*.key",
+        "delayksk.key",
+        "delayzsk.key",
+        "delzsk.key",
+        "dig.out.*",
+        "dsset-.",
+        "dsset-bar.",
+        "dsset-delay.example.",
+        "inact.key",
+        "inaczsk-ksk.key",
+        "inaczsk-zsk.key",
+        "noksk-ksk.key",
+        "nopriv.key",
+        "nozsk-ksk.key",
+        "nozsk-zsk.key",
+        "nsupdate.out*",
+        "prepub.key",
+        "rev.key",
+        "settime.out.*",
+        "signing.*out*",
+        "standby.key",
+        "sync.key",
+        "unpub.key",
+        "vanishing.key",
+        "*/K*",
+        "*/dsset-*",
+        "*/*.signed",
+        "*/*.jnl",
+        "*/*.bk",
+        "ns*/_default.nzf*",
+        "ns*/_default.nzd*",
+        "ns1/root.db",
+        "ns1/signing.out",
+        "ns1/trusted.conf",
+        "ns2/bar.db",
+        "ns2/child.nsec3.example.db",
+        "ns2/child.optout.example.db",
+        "ns2/dsset-dname-at-apex-nsec3.example.",
+        "ns2/dsset-example.",
+        "ns2/dsset-nsec3-to-nsec.example.",
+        "ns2/dsset-nsec3.example.",
+        "ns2/dsset-oldsigs.example.",
+        "ns2/dsset-optout.example.",
+        "ns2/dsset-private.secure.example.",
+        "ns2/dsset-rsasha256.example.",
+        "ns2/dsset-rsasha512.example.",
+        "ns2/dsset-secure.example.",
+        "ns2/example.db",
+        "ns2/insecure.secure.example.db",
+        "ns2/nsec3-with-ent.db",
+        "ns2/optout-with-ent.db",
+        "ns2/private.conf",
+        "ns2/private.secure.example.db",
+        "ns2/trusted.conf",
+        "ns3/autonsec3.example.db",
+        "ns3/cdnskey-delete.example.db",
+        "ns3/cds-delete.example.db",
+        "ns3/delzsk.example.db",
+        "ns3/dname-at-apex-nsec3.example.db",
+        "ns3/dsset-autonsec3.example.",
+        "ns3/dsset-dname-at-apex-nsec3.example.",
+        "ns3/dsset-inaczsk.example.",
+        "ns3/dsset-inaczsk2.example.",
+        "ns3/dsset-kskonly.example.",
+        "ns3/dsset-noksk.example.",
+        "ns3/dsset-nozsk.example.",
+        "ns3/dsset-nsec-only.example.",
+        "ns3/dsset-nsec3-to-nsec.example.",
+        "ns3/dsset-nsec3-to-nsec3.example.",
+        "ns3/dsset-nsec3.example.",
+        "ns3/dsset-nsec3.nsec3.example.",
+        "ns3/dsset-nsec3.optout.example.",
+        "ns3/dsset-oldsigs.example.",
+        "ns3/dsset-optout.example.",
+        "ns3/dsset-optout.nsec3.example.",
+        "ns3/dsset-optout.optout.example.",
+        "ns3/dsset-prepub.example.",
+        "ns3/dsset-rsasha256.example.",
+        "ns3/dsset-rsasha512.example.",
+        "ns3/dsset-secure.example.",
+        "ns3/dsset-secure.nsec3.example.",
+        "ns3/dsset-secure.optout.example.",
+        "ns3/dsset-sync.example.",
+        "ns3/inacksk2.example.db",
+        "ns3/inacksk3.example.db",
+        "ns3/inaczsk.example.db",
+        "ns3/inaczsk2.example.db",
+        "ns3/inaczsk3.example.db",
+        "ns3/jitter.nsec3.example.db",
+        "ns3/kg.out",
+        "ns3/kskonly.example.db",
+        "ns3/noksk.example.db",
+        "ns3/nozsk.example.db",
+        "ns3/nsec-only.example.db",
+        "ns3/nsec3-to-nsec.example.db",
+        "ns3/nsec3-to-nsec3.example.db",
+        "ns3/nsec3.example.db",
+        "ns3/nsec3.nsec3.example.db",
+        "ns3/nsec3.optout.example.db",
+        "ns3/oldsigs.example.db",
+        "ns3/optout.example.db",
+        "ns3/optout.nsec3.example.db",
+        "ns3/optout.optout.example.db",
+        "ns3/prepub.example.db",
+        "ns3/prepub.example.db.in",
+        "ns3/reconf.example.db",
+        "ns3/rsasha256.example.db",
+        "ns3/rsasha512.example.db",
+        "ns3/s.out",
+        "ns3/secure.example.db",
+        "ns3/secure.nsec3.example.db",
+        "ns3/secure.optout.example.db",
+        "ns3/secure-to-insecure.example.db",
+        "ns3/secure-to-insecure2.example.db",
+        "ns3/st.out",
+        "ns3/sync.example.db",
+        "ns3/trusted.conf",
+        "ns3/ttl1.example.db",
+        "ns3/ttl2.example.db",
+        "ns3/ttl3.example.db",
+        "ns3/ttl4.example.db",
+        "ns4/private.conf",
+        "ns4/trusted.conf",
+        "ns5/trusted.conf",
+    ]
+)
+
 
 @isctest.mark.flaky(max_runs=2)
 def test_autosign(run_tests_sh):

bin/tests/system/builtin/clean.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns?/named.run
-rm -f ns?/named.memstats
-rm -f ns?/named.conf
-rm -f rndc.status.ns*
-rm -f dig.out.ns*
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/builtin/tests_sh_builtin.py

@@ -9,6 +9,15 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "rndc.status.ns*",
+    ]
+)
+
 
 def test_builtin(run_tests_sh):
     run_tests_sh()

bin/tests/system/cacheclean/clean.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after cache cleaner tests.
-#
-
-rm -f dig.out.ns2
-rm -f dig.out.expire
-rm -f rndc.out.*
-rm -f sed.out.*
-rm -f */named.memstats
-rm -f */named.run
-rm -f */named.conf
-rm -f ns2/named_dump.db.*
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/cacheclean/tests_sh_cacheclean.py

@@ -9,6 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "rndc.out.*",
+        "sed.out.*",
+        "ns2/named_dump.db.*",
+    ]
+)
+
 
 def test_cacheclean(run_tests_sh):
     run_tests_sh()

bin/tests/system/case/clean.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f dig.ns*.test*
-rm -f ns*/named.conf
-rm -f ns*/named.lock
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns1/dynamic.db
-rm -f ns1/dynamic.db.jnl
-rm -f ns2/dynamic.bk
-rm -f ns2/dynamic.bk.jnl
-rm -f ns2/example.bk
-rm -f ns*/managed-keys.bind*

bin/tests/system/case/tests_sh_case.py

@@ -9,6 +9,19 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.ns*.test*",
+        "ns1/dynamic.db",
+        "ns1/dynamic.db.jnl",
+        "ns2/dynamic.bk",
+        "ns2/dynamic.bk.jnl",
+        "ns2/example.bk",
+    ]
+)
+
 
 def test_case(run_tests_sh):
     run_tests_sh()

bin/tests/system/catz/clean.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f dig.out.*
-rm -f ns*/*.jnl
-rm -f ns*/*.mkeys
-rm -f ns*/*.nzd ns*/*.nzd-lock
-rm -f ns*/*.nzf
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.conf
-rm -f ns*/named.lock
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/named.run.prev
-rm -f ns1/*dom*example.db
-rm -f ns1/tls1.example.db
-rm -f ns2/__catz__*db
-rm -f ns2/catalog-bad*.db
-rm -f ns2/named.conf.tmp
-rm -f ns3/dom2.example.db ns3/dom13.example.db ns3/dom14.example.db ns3/dom17.example.db ns3/dom18.example.db
-rm -f ns4/__catz__*db
-rm -f ns4/catalog-self.example.db
-rm -f ns[123]/catalog[1234].example.db
-rm -f ns[14]/catalog-tls.example.db
-rm -f nsupdate.out.*
-rm -f wait_for_message.*
-rm -rf ns2/zonedir

bin/tests/system/catz/tests_sh_catz.py

@@ -9,6 +9,26 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "nsupdate.out.*",
+        "wait_for_message.*",
+        "ns*/*.jnl",
+        "ns*/*.nzf*",
+        "ns*/*.nzd*",
+        "ns*/catalog*.example.db",
+        "ns*/*dom*.example.db",
+        "ns1/tls1.example.db",
+        "ns2/__catz__*.db",
+        "ns2/named.conf.tmp",
+        "ns2/zonedir",
+        "ns4/__catz__*.db",
+    ]
+)
+
 
 def test_catz(run_tests_sh):
     run_tests_sh()

bin/tests/system/cds/clean.sh

@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f CDNSKEY* CDS* DS*
-rm -f K*
-rm -f UP*
-rm -f brk.*
-rm -f db.*
-rm -f dsset-*
-rm -f empty
-rm -f sig.*
-rm -f vars.sh
-rm -f err* out* xerr xout

bin/tests/system/cds/tests_sh_cds.py

@@ -9,6 +9,27 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "CDNSKEY.*",
+        "CDS.*",
+        "DS.*",
+        "K*",
+        "UP.*",
+        "brk.*",
+        "db.*",
+        "empty",
+        "err.*",
+        "out.*",
+        "sig.*",
+        "vars.sh",
+        "xerr",
+        "xout",
+    ]
+)
+
 
 def test_cds(run_tests_sh):
     run_tests_sh()

bin/tests/system/chain/clean.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f dig.out.* named*.pid
-rm -f ns*/named.conf
-rm -f */named.memstats */named.recursing */named.lock */named.run */ans.run
-rm -f ns2/K* ns2/dsset-* ns2/*.db.signed
-rm -f ns*/managed-keys.bind*

bin/tests/system/chain/tests_sh_chain.py

@@ -9,6 +9,18 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "*/ans.run",
+        "ns2/K*",
+        "ns2/dsset-*",
+        "ns2/*.db.signed",
+    ]
+)
+
 
 def test_chain(run_tests_sh):
     run_tests_sh()

bin/tests/system/checkconf/clean.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f bad-kasp-keydir1.conf
-rm -f bad-kasp-keydir2.conf
-rm -f bad-kasp-keydir3.conf
-rm -f bad-kasp-keydir4.conf
-rm -f bad-kasp-keydir5.conf
-rm -f checkconf.out*
-rm -f diff.out*
-rm -f good-kasp.conf.in
-rm -f good-server-christmas-tree.conf
-rm -f good.conf.in good.conf.out badzero.conf *.out
-rm -rf keys
-rm -f ns*/named.lock
-rm -rf test.keydir

bin/tests/system/checkconf/tests_sh_checkconf.py

@@ -9,6 +9,27 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "*.out",
+        "bad-kasp-keydir1.conf",
+        "bad-kasp-keydir2.conf",
+        "bad-kasp-keydir3.conf",
+        "bad-kasp-keydir4.conf",
+        "bad-kasp-keydir5.conf",
+        "badzero.conf",
+        "checkconf.out*",
+        "diff.out*",
+        "good-kasp.conf.in",
+        "good-server-christmas-tree.conf",
+        "good.conf.in",
+        "good.conf.out",
+        "keys",
+    ]
+)
+
 
 def test_checkconf(run_tests_sh):
     run_tests_sh()

bin/tests/system/checkds/clean.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-rm -f dig.out*
-rm -f ns*/named.conf ns*/named.memstats ns*/named.run*
-rm -f ns*/*.jnl ns*/*.jbk
-rm -f ns*/K*.private ns*/K*.key ns*/K*.state
-rm -f ns*/dsset-*
-rm -f ns*/*.db ns*/*.jnl ns*/*.jbk ns*/*.db.signed ns*/*.db.infile
-rm -f ns*/keygen.out.* ns*/settime.out.* ns*/signer.out.*
-rm -f ns*/managed-keys.bind*
-rm -f ns*/trusted.conf
-rm -f ns*/*.mkeys
-rm -f ns*/zones
-rm -f *.checkds.out

bin/tests/system/checkds/tests_checkds.py

@@ -11,6 +11,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+
 from typing import NamedTuple, Tuple
 
 import os
@@ -29,9 +30,28 @@ import dns.rdataclass
 import dns.rdatatype
 
 
-pytestmark = pytest.mark.skipif(
-    sys.version_info < (3, 7), reason="Python >= 3.7 required [GL #3001]"
-)
+pytestmark = [
+    pytest.mark.skipif(
+        sys.version_info < (3, 7), reason="Python >= 3.7 required [GL #3001]"
+    ),
+    pytest.mark.extra_artifacts(
+        [
+            "*.checkds.out",
+            "ns*/*.db",
+            "ns*/*.db.infile",
+            "ns*/*.db.signed",
+            "ns*/*.jnl",
+            "ns*/*.jbk",
+            "ns*/dsset-*",
+            "ns*/K*",
+            "ns*/keygen.out*",
+            "ns*/settime.out*",
+            "ns*/signer.out*",
+            "ns*/trusted.conf",
+            "ns*/zones",
+        ]
+    ),
+]
 
 
 def has_signed_apex_nsec(zone, response):

bin/tests/system/checknames/clean.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns*/named.conf
-rm -f dig.out.ns?.test*
-rm -f nsupdate.out.test*
-rm -f ns1/*.example.db
-rm -f ns1/*.update.db
-rm -f ns1/*.update.db.jnl
-rm -f ns4/*.update.db
-rm -f ns4/*.update.db.jnl
-rm -f ns5/*.update.db
-rm -f ns5/*.update.db.jnl
-rm -f */named.memstats
-rm -f */named.run
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/checknames/tests_sh_checknames.py

@@ -9,6 +9,22 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.ns*.test*",
+        "nsupdate.out.*",
+        "ns1/*.example.db",
+        "ns1/*.update.db",
+        "ns1/*.update.db.jnl",
+        "ns4/*.update.db",
+        "ns4/*.update.db.jnl",
+        "ns5/*.update.db",
+        "ns5/*.update.db.jnl",
+    ]
+)
+
 
 def test_checknames(run_tests_sh):
     run_tests_sh()

bin/tests/system/checkzone/clean.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f test.* good1.db.raw named-compilezone
-rm -f ns*/named.lock
-rm -f zones/bad-tsig.db
-rm -f zones/zone1_*.txt

bin/tests/system/checkzone/tests_sh_checkzone.py

@@ -9,6 +9,18 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "good1.db.raw",
+        "named-compilezone",
+        "test.*",
+        "zones/bad-tsig.db",
+        "zones/zone1_*.txt",
+    ]
+)
+
 
 def test_checkzone(run_tests_sh):
     run_tests_sh()

bin/tests/system/conftest.py

@@ -348,6 +348,7 @@ def logger(request, system_test_name):
 @pytest.fixture(scope="module")
 def expected_artifacts(request):
     common_artifacts = [
+        "ns*/named.lock",
         "ns*/named.run",
         "ns*/named.run.prev",
         "ns*/named.conf",

bin/tests/system/cookie/clean.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns*/named.conf
-rm -f dig.out.*
-rm -f named.run.*
-rm -f rndc.out.*
-rm -f ns1/named_dump.db*
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.run.prev
-rm -f ans*/ans.run ans*/ans.log

bin/tests/system/cookie/tests_sh_cookie.py

@@ -9,6 +9,19 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "named.run.*",
+        "rndc.out.*",
+        "ans*/ans.run",
+        "ans*/query.log",
+        "ns1/named_dump.db*",
+    ]
+)
+
 
 def test_cookie(run_tests_sh):
     run_tests_sh()

bin/tests/system/cpu/clean.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-rm -f ./named.run.*

bin/tests/system/cpu/tests_sh_cpu.py

@@ -9,6 +9,15 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "named.run.*",
+        "ns1/managed-keys.*",
+    ]
+)
+
 
 def test_cpu(run_tests_sh):
     run_tests_sh()

bin/tests/system/database/clean.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns1/named.conf ns1/named.run ns1/named.memstats
-rm -f dig.out.*
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/database/tests_sh_database.py

@@ -9,6 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+    ]
+)
+
 
 def test_database(run_tests_sh):
     run_tests_sh()

bin/tests/system/dialup/clean.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns2/example.bk
-rm -f ns3/example.bk
-rm -f */named.memstats */named.run
-rm -f ns*/named.conf
-rm -f ns*/named.lock

bin/tests/system/dialup/tests_dialup_zone_transfer.py

@@ -9,11 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import dns.message
 import pytest
 
 import isctest
 
-import dns.message
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "ns2/example.bk",
+        "ns3/example.bk",
+    ]
+)
 
 
 @pytest.mark.parametrize("ns", [2, 3])

bin/tests/system/digdelv/clean.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-rm -f ./*/anchor.*
-rm -f ./*/named.conf
-rm -f ./*/named.memstats
-rm -f ./*/named.run
-rm -f ./ans*/ans.run
-rm -f ./ans*/query.log
-rm -f ./delv.out.test*
-rm -f ./dig.out.*test*
-rm -f ./dig.out.mm.*
-rm -f ./dig.out.mn.*
-rm -f ./dig.out.nm.*
-rm -f ./dig.out.nn.*
-rm -f ./host.out.test*
-rm -f ./ns*/managed-keys.bind*
-rm -f ./ns*/named.lock
-rm -f ./ns2/dsset-example.
-rm -f ./ns2/example.db ./ns2/K* ./ns2/keyid ./ns2/keydata
-rm -f ./nslookup.out.test*
-rm -f ./yamlget.out.*
-rm -f ./nsupdate.out.test*

bin/tests/system/digdelv/tests_sh_digdelv.py

@@ -9,6 +9,30 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "delv.out.*",
+        "dig.out.*",
+        "host.out.*",
+        "nslookup.out.*",
+        "nsupdate.out.*",
+        "yamlget.out.*",
+        "ans*/ans.run",
+        "ans*/query.log",
+        "ns*/anchor.*",
+        "ns*/dsset-*",
+        "ns*/keydata",
+        "ns*/keyid",
+        "ns*/K*.key",
+        "ns*/K*.private",
+        "ns1/root.db",
+        "ns2/example.db",
+        "ns2/example.tld.db",
+    ]
+)
+
 
 def test_digdelv(run_tests_sh):
     run_tests_sh()

bin/tests/system/dispatch/clean.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns*/named.run ns*/named.conf ns*/named.pid ns*/managed-keys.bind*
-rm -f ans*/ans.run ans*/ans.pid
-rm -f ns*/named.memstats

bin/tests/system/dispatch/tests_connreset.py

@@ -17,6 +17,12 @@ import isctest
 pytest.importorskip("dns")
 import dns.message
 
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "ans*/ans.run",
+    ]
+)
+
 
 def test_connreset():
     msg = dns.message.make_query(

bin/tests/system/dlzexternal/clean.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after dlzexternal tests.
-#
-
-rm -f ns1/update.txt
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f ns1/ddns.key
-rm -f dig.out*
-rm -f ns*/named.lock
-rm -f ns1/session.key
-rm -f ns*/managed-keys.bind*

bin/tests/system/dlzexternal/tests_sh_dlzexternal.py

@@ -9,6 +9,16 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "ns1/ddns.key",
+        "ns1/update.txt",
+    ]
+)
+
 
 def test_dlzexternal(run_tests_sh):
     run_tests_sh()

bin/tests/system/dns64/clean.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns*/named.conf
-rm -f ns1/K*
-rm -f ns1/signed.db*
-rm -f ns1/dsset-signed.
-rm -f */named.memstats
-rm -f */named.run
-rm -f dig.out.*
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/dns64/tests_sh_dns64.py

@@ -9,6 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "ns1/K*",
+        "ns1/dsset-signed.",
+        "ns1/signed.db*",
+    ]
+)
+
 
 def test_dns64(run_tests_sh):
     run_tests_sh()

bin/tests/system/dnssec/clean.sh

@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-rm -f ./*/K* ./*/keyset-* ./*/dsset-* ./*/signedkey-* ./*/*.signed
-rm -f ./*/example.bk
-rm -f ./*/named.conf
-rm -f ./*/named.memstats
-rm -f ./*/named.run ./*/named.run.prev
-rm -f ./*/named.secroots
-rm -f ./*/tmp* ./*/*.jnl ./*/*.bk ./*/*.jbk
-rm -f ./*/trusted.conf ./*/managed.conf ./*/revoked.conf
-rm -f ./Kexample.* ./Kkeygen* ./keygen*.err
-rm -f ./ans10/query.log ./ans10/ans.run
-rm -f ./canonical?.*
-rm -f ./delv.out*
-rm -f ./delve.out*
-rm -f ./dig.out.*
-rm -f ./ns2/too-many-iterations.db
-rm -f ./dnssectools.out*
-rm -f ./dsfromkey.out.*
-rm -f ./keygen.err
-rm -f ./named.secroots.test*
-rm -f ./nosign.before
-rm -f ./ns*/*.nta
-rm -f ./ns*/managed-keys.bind ./ns*/managed-keys.bind.jnl ./ns*/*.mkeys*
-rm -f ./ns*/named.lock
-rm -f ./ns1/managed.key.id
-rm -f ./ns1/root.db ./ns2/example.db ./ns2/managed.db ./ns2/trusted.db
-rm -f ./ns1/trusted.keys
-rm -f ./ns2/algroll.db
-rm -f ./ns2/badparam.db ./ns2/badparam.db.bad
-rm -f ./ns2/cdnskey-kskonly.secure.db
-rm -f ./ns2/cdnskey-kskonly.secure.id
-rm -f ./ns2/cdnskey-update.secure.db
-rm -f ./ns2/cdnskey-x.secure.db
-rm -f ./ns2/cdnskey.secure.db
-rm -f ./ns2/cds-auto.secure.db ./ns2/cds-auto.secure.db.jnl
-rm -f ./ns2/cds-kskonly.secure.db
-rm -f ./ns2/cds-kskonly.secure.id
-rm -f ./ns2/cds-update.secure.db ./ns2/cds-update.secure.db.jnl
-rm -f ./ns2/cds.secure.db ./ns2/cds-x.secure.db
-rm -f ./ns2/in-addr.arpa.db
-rm -f ./ns2/nsec3chain-test.db
-rm -f ./ns2/single-nsec3.db
-rm -f ./ns2/updatecheck-kskonly.secure.*
-rm -f ./ns3/auto-nsec.example.db ./ns3/auto-nsec3.example.db
-rm -f ./ns3/badds.example.db
-rm -f ./ns3/dname-at-apex-nsec3.example.db
-rm -f ./ns3/dnskey-nsec3-unknown.example.db
-rm -f ./ns3/dnskey-nsec3-unknown.example.db.tmp
-rm -f ./ns3/dnskey-unknown.example.db
-rm -f ./ns3/dnskey-unknown.example.db.tmp
-rm -f ./ns3/dnskey-unsupported-2.example.db
-rm -f ./ns3/dnskey-unsupported-2.example.db.tmp
-rm -f ./ns3/dnskey-unsupported.example.db
-rm -f ./ns3/dnskey-unsupported.example.db.tmp
-rm -f ./ns3/dynamic.example.db ./ns3/dynamic.example.db.signed.jnl
-rm -f ./ns3/expired.example.db ./ns3/update-nsec3.example.db
-rm -f ./ns3/expiring.example.db ./ns3/nosign.example.db
-rm -f ./ns3/future.example.db ./ns3/trusted-future.key
-rm -f ./ns3/inline.example.db.signed
-rm -f ./ns3/kskonly.example.db
-rm -f ./ns3/lower.example.db ./ns3/upper.example.db ./ns3/upper.example.db.lower
-rm -f ./ns3/managed-future.example.db
-rm -f ./ns3/multiple.example.db ./ns3/nsec3-unknown.example.db ./ns3/nsec3.example.db
-rm -f ./ns3/nsec3.nsec3.example.db
-rm -f ./ns3/nsec3.optout.example.db
-rm -f ./ns3/occluded.example.db
-rm -f ./ns3/optout-unknown.example.db ./ns3/optout.example.db
-rm -f ./ns3/optout.nsec3.example.db
-rm -f ./ns3/optout.optout.example.db
-rm -f ./ns3/publish-inactive.example.db
-rm -f ./ns3/revkey.example.db
-rm -f ./ns3/rsasha256.example.db ./ns3/rsasha512.example.db
-rm -f ./ns3/secure.below-cname.example.db
-rm -f ./ns3/secure.example.db ./ns3/*.managed.db ./ns3/*.trusted.db
-rm -f ./ns3/secure.nsec3.example.db
-rm -f ./ns3/secure.optout.example.db
-rm -f ./ns3/siginterval.conf
-rm -f ./ns3/siginterval.example.db
-rm -f ./ns3/split-dnssec.example.db
-rm -f ./ns3/split-smart.example.db
-rm -f ./ns3/ttlpatch.example.db ./ns3/ttlpatch.example.db.signed
-rm -f ./ns3/ttlpatch.example.db.patched
-rm -f ./ns3/unsecure.example.db ./ns3/bogus.example.db ./ns3/keyless.example.db
-rm -f ./ns3/unsupported.managed.db.tmp ./ns3/unsupported.trusted.db.tmp
-rm -f ./ns3/NSEC ./ns3/NSEC3
-rm -f ./ns4/named_dump.db*
-rm -f ./ns6/optout-tld.db
-rm -f ./ns7/multiple.example.bk ./ns7/nsec3.example.bk ./ns7/optout.example.bk
-rm -f ./ns7/split-rrsig.db ./ns7/split-rrsig.db.unsplit
-rm -f ./nsupdate.out*
-rm -f ./python.out.*
-rm -f ./rndc.out.*
-rm -f ./signer/*.db
-rm -f ./signer/*.signed.post*
-rm -f ./signer/*.signed.pre*
-rm -f ./signer/example.db.after ./signer/example.db.before
-rm -f ./signer/example.db.changed
-rm -f ./signer/general/dsset*
-rm -f ./signer/general/signed.zone
-rm -f ./signer/general/signer.out.*
-rm -f ./signer/nsec3param.out
-rm -f ./signer/signer.out.*
-rm -f ./signing.out*

bin/tests/system/dnssec/tests_sh_dnssec.py

@@ -9,6 +9,160 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "K*",
+        "canonical*",
+        "delv.out*",
+        "dig.out.*",
+        "dnssectools.out.*",
+        "dsfromkey.out.*",
+        "keygen*.err*",
+        "named.secroots.*",
+        "nosign.before",
+        "nsupdate.out.*",
+        "python.out.*",
+        "rndc.out.*",
+        "signing.out*",
+        "*/K*",
+        "*/dsset-*",
+        "*/managed.conf",
+        "*/trusted.conf",
+        "*/*.bk",
+        "*/*.jnl",
+        "*/*.jbk",
+        "*/*.signed",
+        "*/*.mkeys*",
+        "ans*/ans.run",
+        "ans*/query.log",
+        "ns1/managed.key.id",
+        "ns1/root.db",
+        "ns1/trusted.keys",
+        "ns2/algroll.db",
+        "ns2/badparam.db",
+        "ns2/badparam.db.bad",
+        "ns2/cdnskey-kskonly.secure.db",
+        "ns2/cdnskey-kskonly.secure.id",
+        "ns2/cdnskey-update.secure.db",
+        "ns2/cdnskey-update.secure.id",
+        "ns2/cdnskey-x.secure.db",
+        "ns2/cdnskey.secure.db",
+        "ns2/cds-kskonly.secure.db",
+        "ns2/cds-kskonly.secure.id",
+        "ns2/cds-update.secure.db",
+        "ns2/cds-update.secure.id",
+        "ns2/cds-x.secure.db",
+        "ns2/cds-x.secure.db",
+        "ns2/cds.secure.db",
+        "ns2/example.db",
+        "ns2/in-addr.arpa.db",
+        "ns2/lazy-ksk.db",
+        "ns2/managed.db",
+        "ns2/nsec3chain-test.db",
+        "ns2/single-nsec3.db",
+        "ns2/too-many-iterations.db",
+        "ns2/trusted.db",
+        "ns2/updatecheck-kskonly.secure.ksk.id",
+        "ns2/updatecheck-kskonly.secure.ksk.key",
+        "ns2/updatecheck-kskonly.secure.zsk.id",
+        "ns2/updatecheck-kskonly.secure.zsk.id2",
+        "ns2/updatecheck-kskonly.secure.zsk.id3",
+        "ns2/updatecheck-kskonly.secure.zsk.key",
+        "ns3/NSEC",
+        "ns3/NSEC3",
+        "ns3/auto-nsec.example.db",
+        "ns3/auto-nsec3.example.db",
+        "ns3/badds.example.db",
+        "ns3/bogus.example.db",
+        "ns3/disabled.managed.db",
+        "ns3/disabled.trusted.db",
+        "ns3/dname-at-apex-nsec3.example.db",
+        "ns3/dnskey-nsec3-unknown.example.db",
+        "ns3/dnskey-nsec3-unknown.example.db.tmp",
+        "ns3/dnskey-unknown.example.db",
+        "ns3/dnskey-unknown.example.db.tmp",
+        "ns3/dnskey-unsupported-2.example.db",
+        "ns3/dnskey-unsupported.example.db",
+        "ns3/dnskey-unsupported.example.db.tmp",
+        "ns3/dynamic.example.db",
+        "ns3/enabled.managed.db",
+        "ns3/enabled.trusted.db",
+        "ns3/example.bk",
+        "ns3/expired.example.db",
+        "ns3/expiring.example.db",
+        "ns3/future.example.db",
+        "ns3/keyless.example.db",
+        "ns3/kskonly.example.db",
+        "ns3/lower.example.db",
+        "ns3/managed-future.example.db",
+        "ns3/multiple.example.db",
+        "ns3/nosign.example.db",
+        "ns3/nsec3-unknown.example.db",
+        "ns3/nsec3.example.db",
+        "ns3/nsec3.nsec3.example.db",
+        "ns3/nsec3.optout.example.db",
+        "ns3/nsec3chain-test.bk",
+        "ns3/occluded.example.db",
+        "ns3/optout-unknown.example.db",
+        "ns3/optout.example.db",
+        "ns3/optout.nsec3.example.db",
+        "ns3/optout.optout.example.db",
+        "ns3/publish-inactive.example.db",
+        "ns3/revkey.example.db",
+        "ns3/revoked.managed.db",
+        "ns3/revoked.trusted.db",
+        "ns3/rfc2335.example.bk",
+        "ns3/rsasha256.example.db",
+        "ns3/rsasha512.example.db",
+        "ns3/secure.below-cname.example.db",
+        "ns3/secure.example.db",
+        "ns3/secure.managed.db",
+        "ns3/secure.nsec3.example.db",
+        "ns3/secure.optout.example.db",
+        "ns3/secure.trusted.db",
+        "ns3/siginterval.conf",
+        "ns3/siginterval.example.db",
+        "ns3/split-dnssec.example.db",
+        "ns3/split-smart.example.db",
+        "ns3/trusted-future.key",
+        "ns3/ttlpatch.example.db",
+        "ns3/ttlpatch.example.db.patched",
+        "ns3/unsupported.managed.db",
+        "ns3/unsupported.managed.db.tmp",
+        "ns3/unsupported.trusted.db",
+        "ns3/unsupported.trusted.db.tmp",
+        "ns3/update-nsec3.example.db",
+        "ns3/update-nsec3.example.db.signed",
+        "ns3/upper.example.db",
+        "ns3/upper.example.db.lower",
+        "ns4/managed.conf",
+        "ns4/managed-keys.bind",
+        "ns4/named.secroots",
+        "ns4/named_dump.db.*",
+        "ns5/revoked.conf",
+        "ns5/trusted.conf",
+        "ns6/optout-tld.db",
+        "ns7/split-rrsig.db",
+        "ns7/split-rrsig.db.unsplit",
+        "ns8/managed-keys.bind",
+        "signer/example.db",
+        "signer/example.db.after",
+        "signer/example.db.before",
+        "signer/example.db.changed",
+        "signer/example2.db",
+        "signer/example3.db",
+        "signer/general/dsset-*",
+        "signer/general/signed.zone",
+        "signer/general/signer.out.*",
+        "signer/nsec3param.out",
+        "signer/prepub.db",
+        "signer/signer.err.*",
+        "signer/signer.out.*",
+    ]
+)
+
 
 def test_dnssec(run_tests_sh):
     run_tests_sh()

bin/tests/system/dnstap/clean.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run
-rm -f */named.run.prev
-rm -f */named.stats
-rm -f dig.out*
-rm -f dnstap.*
-rm -f fstrm_capture.out.*
-rm -f ns*/dnstap.out
-rm -f ns*/dnstap.out.save
-rm -f ns*/dnstap.out.save.?
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.lock
-rm -f ns2/dnstap.out.*
-rm -f ns2/example.db ns2/example.db.jnl
-rm -f ns3/dnstap.out.*
-rm -f ydump.out

bin/tests/system/dnstap/tests_dnstap.py

@@ -22,6 +22,14 @@ import dns.message
 
 pytest.importorskip("dns", minversion="2.0.0")
 
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dnstap.out.*",
+        "ns*/dnstap.out*",
+        "ns2/example.db",
+    ]
+)
+
 
 def run_rndc(server, rndc_command):
     """

bin/tests/system/dnstap/tests_sh_dnstap.py

@@ -9,6 +9,22 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out*",
+        "dnstap.hex*",
+        "dnstap.out*",
+        "fstrm_capture.out.*",
+        "nsupdate.out*",
+        "ydump.out*",
+        "ns*/dnstap.out*",
+        "ns2/example.db",
+        "ns2/example.db.jnl",
+    ]
+)
+
 
 def test_dnstap(run_tests_sh):
     run_tests_sh()

bin/tests/system/doth/clean.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after zone transfer tests.
-#
-
-rm -f ./*/named.conf
-rm -f ./*/named.memstats
-rm -f ./*/named.run
-rm -f ./*/named.run.prev
-rm -f ./dig.out.*
-rm -f ./gnutls-cli.*
-rm -f ./sslyze.log.*
-rm -f ./*/example*.db
-rm -rf ./headers.*

bin/tests/system/doth/tests_gnutls.py

@@ -25,6 +25,13 @@ import dns.name
 import dns.rdataclass
 import dns.rdatatype
 
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "gnutls-cli.*",
+        "ns*/example*.db",
+    ]
+)
+
 
 def test_gnutls_cli_query(gnutls_cli_executable, named_tlsport):
     # Prepare the example/SOA query which will be sent over TLS.

bin/tests/system/doth/tests_sh_doth.py

@@ -9,6 +9,16 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "headers.*",
+        "ns*/example*.db",
+    ]
+)
+
 
 def test_doth(run_tests_sh):
     run_tests_sh()

bin/tests/system/doth/tests_sslyze.py

@@ -15,9 +15,17 @@ import os
 import pathlib
 import subprocess
 
-import isctest
 import pytest
 
+import isctest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "sslyze.log.*",
+        "ns*/example*.db",
+    ]
+)
+
 
 def is_pid_alive(pid):
     try:

bin/tests/system/dsdigest/clean.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */K* */dsset-* */*.signed */trusted.conf
-rm -f ns1/root.db
-rm -f ns1/signer.err
-rm -f ns2/good.db ns2/bad.db
-rm -f */named.conf
-rm -f */named.run
-rm -f */named.memstats
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/dsdigest/tests_dsdigest.py

@@ -10,9 +10,22 @@
 # information regarding copyright ownership.
 
 import dns.message
+import pytest
 
 import isctest
 
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "ns*/K*",
+        "ns*/dsset-*",
+        "ns*/trusted.conf",
+        "ns*/*.signed",
+        "ns1/root.db",
+        "ns2/bad.db",
+        "ns2/good.db",
+    ]
+)
+
 
 def test_dsdigest_good():
     """Check that validation with enabled digest types works"""

bin/tests/system/dupsigs/clean.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f dig.out*
-rm -f ns1/named.conf
-rm -f ns1/named.lock
-rm -f ns1/named.memstats
-rm -f ns1/named.run
-rm -f ns1/signing.test.db
-rm -f ns1/signing.test.db.jbk
-rm -f ns1/signing.test.db.signed
-rm -f ns1/signing.test.db.signed.jnl
-rm -f ns1/keys/signing.test/K*
-rm -f ns1/managed-keys.bind*

bin/tests/system/dupsigs/tests_sh_dupsigs.py

@@ -9,6 +9,33 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "*.created",
+        "cdnskey.ns*",
+        "cds.ns*",
+        "dig.out.*",
+        "rndc.dnssec.status.out.*",
+        "secondary.cdnskey.ns*",
+        "secondary.cds.ns*",
+        "verify.out.*",
+        "ns1/signing.test.db",
+        "ns*/K*",
+        "ns*/db-*",
+        "ns*/keygen.out.*",
+        "ns*/keys",
+        "ns*/*.jbk",
+        "ns*/*.jnl",
+        "ns*/*.zsk",
+        "ns*/*.signed",
+        "ns*/*.journal.out.*",
+        "ns*/settime.out.*",
+        "ns*/model2.secondary.db",
+    ]
+)
+
 
 def test_dupsigs(run_tests_sh):
     run_tests_sh()

bin/tests/system/dyndb/clean.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after dyndb tests.
-#
-rm -f */named.conf
-rm -f */named.run
-rm -f ns1/named.memstats
-rm -f ns1/update.txt
-rm -f added.a.out.*
-rm -f added.ptr.out.*
-rm -f deleted.a.out.*
-rm -f deleted.ptr.out.*
-rm -f ns*/managed-keys.bind*

bin/tests/system/dyndb/tests_sh_dyndb.py

@@ -9,6 +9,16 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "added.*",
+        "deleted.*",
+        "ns1/update.txt",
+    ]
+)
+
 
 def test_dyndb(run_tests_sh):
     run_tests_sh()

bin/tests/system/ecdsa/clean.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-rm -f ./dig.out*
-rm -f ns*/*.signed
-rm -f ns*/K*
-rm -f ns*/dsset-*
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.conf
-rm -f ns*/named.lock
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/root.db
-rm -f ns*/signer.err
-rm -f ns*/trusted.conf
-rm -f *-supported.file

bin/tests/system/ecdsa/tests_sh_ecdsa.py

@@ -9,6 +9,21 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "*-supported.file",
+        "dig.out.*",
+        "ns*/trusted.conf",
+        "ns1/K*",
+        "ns1/dsset-*",
+        "ns1/root.db",
+        "ns1/root.db.signed",
+        "ns1/signer.err",
+    ]
+)
+
 
 def test_ecdsa(run_tests_sh):
     run_tests_sh()

bin/tests/system/eddsa/clean.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-rm -f ./dig.out*
-rm -f ns*/*.signed
-rm -f ns*/K*
-rm -f ns*/dsset-*
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.conf
-rm -f ns*/named.lock
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/root.db
-rm -f ns*/signer.err
-rm -f ns*/trusted.conf
-rm -f ns*/example.com.db
-rm -f *-supported.file

bin/tests/system/eddsa/tests_sh_eddsa.py

@@ -9,6 +9,23 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "*-supported.file",
+        "dig.out.*",
+        "ns*/*.signed",
+        "ns*/K*",
+        "ns*/dsset-*",
+        "ns*/signer.err",
+        "ns*/trusted.conf",
+        "ns1/root.db",
+        "ns2/example.com.db",
+        "ns3/example.com.db",
+    ]
+)
+
 
 def test_eddsa(run_tests_sh):
     run_tests_sh()

bin/tests/system/ednscompliance/clean.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f dig.out*
-rm -f ns*/named.lock
-rm -f ns*/named.conf
-rm -f ns*/named.run
-rm -f ns*/named.memstats
-rm -f ns*/managed-keys.bind*

bin/tests/system/ednscompliance/tests_sh_ednscompliance.py

@@ -9,6 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out*",
+    ]
+)
+
 
 def test_ednscompliance(run_tests_sh):
     run_tests_sh()

bin/tests/system/emptyzones/clean.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns1/named.conf
-rm -f ns*/named.lock
-rm -f ns*/named.run
-rm -f ns*/named.memstats
-rm -f dig.out.test*
-rm -f ns*/managed-keys.bind*

bin/tests/system/emptyzones/tests_sh_emptyzones.py

@@ -9,6 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+    ]
+)
+
 
 def test_emptyzones(run_tests_sh):
     run_tests_sh()

bin/tests/system/enginepkcs11/clean.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-# shellcheck source=conf.sh
-. ../conf.sh
-
-set -e
-
-rm -f dig.out.*
-rm -f dsset-*
-rm -f pin
-rm -f keyfromlabel.err.* keyfromlabel.out.*
-rm -f pkcs11-tool.err.* pkcs11-tool.out.*
-rm -f signer.out.*
-rm -f ns1/*.example.db ns1/*.example.db.signed
-rm -f ns1/*.kskid1 ns1/*.kskid2 ns1/*.zskid1 ns1/*.zskid2
-rm -f ns1/dig.out.*
-rm -f ns1/K*
-rm -f ns1/named.conf ns1/named.run ns1/named.memstats
-rm -f ns1/update.cmd.*
-rm -f ns1/update.log.*
-rm -f ns1/verify.out.*
-rm -f ns1/zone.*.signed.jnl ns1/zone.*.signed.jbk
-
-softhsm2-util --delete-token --token "softhsm2-enginepkcs11" >/dev/null 2>&1 || echo_i "softhsm2-enginepkcs11 token not found for cleaning"

bin/tests/system/enginepkcs11/setup.sh

@@ -16,6 +16,7 @@
 
 set -e
 
+softhsm2-util --delete-token --token "softhsm2-enginepkcs11" >/dev/null 2>&1 || true
 softhsm2-util --init-token --free --pin 1234 --so-pin 1234 --label "softhsm2-enginepkcs11" | awk '/^The token has been initialized and is reassigned to slot/ { print $NF }'
 
 printf '%s' "${HSMPIN:-1234}" >pin

bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py

@@ -9,8 +9,41 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
 import isctest.mark
 
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "dsset-*",
+        "keyfromlabel.err.*",
+        "keyfromlabel.out.*",
+        "pin",
+        "pkcs11-tool.err.*",
+        "pkcs11-tool.out.*",
+        "signer.out.*",
+        "ns*/dig.out.*",
+        "ns*/K*",
+        "ns*/keygen.out.*",
+        "ns*/update.cmd.*",
+        "ns*/update.log.*",
+        "ns*/verify.out.*",
+        "ns*/pin",
+        "ns*/zone.*.jbk",
+        "ns*/zone.*.jnl",
+        "ns*/*.kskid1",
+        "ns*/*.kskid2",
+        "ns*/*.zskid1",
+        "ns*/*.zskid2",
+        "ns1/*.example.db",
+        "ns1/*.example.db.signed",
+        "ns1/named.args",
+        "ns1/zone.*.signed.jnl",
+        "ns1/zone.*.signed.jbk",
+    ]
+)
+
 
 @isctest.mark.supported_openssl_version
 def test_enginepkcs11(run_tests_sh):

bin/tests/system/fetchlimit/clean.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */named.conf */named.memstats */ans.run */named.recursing */named.run */named.run.prev
-rm -f ans4/norespond
-rm -f burst.input.*
-rm -f dig.out*
-rm -f wait_for_message.*
-rm -f ns*/managed-keys.bind*
-rm -f ns3/named.stats ns3/named.stats.prev ns3/named_dump.db
-rm -f ns5/named.stats ns5/named.stats.prev

bin/tests/system/fetchlimit/tests_sh_fetchlimit.py

@@ -9,6 +9,21 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "wait_for_message.*",
+        "ans*/ans.run",
+        "ns3/named_dump.db",
+        "ns3/named.recursing",
+        "ns3/named.stats",
+        "ns3/named.stats.prev",
+        "ns5/named.stats",
+    ]
+)
+
 import isctest.mark
 
 

bin/tests/system/filter-aaaa/clean.sh

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns1/K*
-rm -f ns1/*.signed
-rm -f ns1/signer.err
-rm -f ns1/dsset-*
-
-rm -f */named.run
-rm -f */named.conf
-rm -f */named.memstats
-
-rm -f ns4/K*
-rm -f ns4/*.signed
-rm -f ns4/signer.err
-rm -f ns4/dsset-*
-
-rm -f dig.out.*
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*
-
-rm -f ns*/trusted.conf
-rm -f ns*/keygen.out

bin/tests/system/filter-aaaa/tests_sh_filter_aaaa.py

@@ -9,6 +9,23 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "ns*/trusted.conf",
+        "ns1/K*",
+        "ns1/dsset-*",
+        "ns1/*.signed",
+        "ns1/signer.err",
+        "ns4/K*",
+        "ns4/dsset-*",
+        "ns4/*.signed",
+        "ns4/signer.err",
+    ]
+)
+
 
 def test_filter_aaaa(run_tests_sh):
     run_tests_sh()

bin/tests/system/formerr/clean.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f badnsec3owner.out
-rm -f badrecordname.out
-rm -f dupans.out
-rm -f dupquestion.out
-rm -f keyclass.out
-rm -f malformeddeltype.out
-rm -f malformedrrsig.out
-rm -f nametoolong.out
-rm -f noquestions.out
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.conf
-rm -f ns*/named.lock
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f optwrongname.out
-rm -f qtypeasanswer.out
-rm -f questionclass.out
-rm -f shortquestion.out
-rm -f shortrecord.out
-rm -f tsignotlast.out
-rm -f tsigwrongclass.out
-rm -f twoquestionnames.out
-rm -f twoquestiontypes.out
-rm -f wrongclass.out

bin/tests/system/formerr/tests_sh_formerr.py

@@ -9,6 +9,32 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "badnsec3owner.out",
+        "badrecordname.out",
+        "dupans.out",
+        "dupquestion.out",
+        "keyclass.out",
+        "malformeddeltype.out",
+        "malformedrrsig.out",
+        "nametoolong.out",
+        "noquestions.out",
+        "optwrongname.out",
+        "qtypeasanswer.out",
+        "questionclass.out",
+        "shortquestion.out",
+        "shortrecord.out",
+        "tsignotlast.out",
+        "tsigwrongclass.out",
+        "twoquestionnames.out",
+        "twoquestiontypes.out",
+        "wrongclass.out",
+    ]
+)
+
 
 def test_formerr(run_tests_sh):
     run_tests_sh()

bin/tests/system/forward/clean.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after forward tests.
-#
-rm -f ./statschannel.out.*
-rm -f ./dig.out.*
-rm -f ./*/named.conf
-rm -f ./*/named.memstats
-rm -f ./*/named.run ./*/named.run.prev ./*/ans.run
-rm -f ./*/named_dump.db
-rm -f ./ns*/named.lock
-rm -f ./ns*/managed-keys.bind*
-rm -f ./ns1/root.db ./ns1/root.db.signed
-rm -f ./ns*/trusted.conf
-rm -f ./ns1/K* ./ns1/dsset-*

bin/tests/system/forward/tests_sh_forward.py

@@ -9,6 +9,24 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "statschannel.out.*",
+        "ans*/ans.run",
+        "ans*/query.log",
+        "ns*/trusted.conf",
+        "ns1/K*",
+        "ns1/dsset-*",
+        "ns1/root.db",
+        "ns1/root.db.signed",
+        "ns3/trusted.conf",
+        "ns9/named_dump.db",
+    ]
+)
+
 
 def test_forward(run_tests_sh):
     run_tests_sh()

bin/tests/system/geoip2/clean.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns2/named.conf
-rm -f ns2/example*.db
-rm -f dig.out.* rndc.out.*
-rm -f ns?/named.run
-rm -f ns?/named.memstats
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/geoip2/tests_sh_geoip2.py

@@ -9,6 +9,16 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+        "rndc.out.*",
+        "ns2/example*.db",
+    ]
+)
+
 
 def test_geoip2(run_tests_sh):
     run_tests_sh()

bin/tests/system/glue/clean.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after glue tests.
-#
-
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/glue/tests_glue.py

@@ -9,10 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+
 import dns.message
+import pytest
 
 import isctest
 
+pytest.importorskip("dns", minversion="2.0.0")
+
 
 def test_glue_full_glue_set():
     """test that a ccTLD referral gets a full glue set from the root zone"""

bin/tests/system/hooks/clean.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */named.run
-rm -f */named.conf
-rm -f */named.memstats

bin/tests/system/host/clean.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f ns1/example.db
-rm -f host.out*
-rm -f host.err*
-rm -f ns*/named.lock
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*

bin/tests/system/host/setup.sh

@@ -15,8 +15,6 @@ set -e
 
 . ../conf.sh
 
-$SHELL clean.sh
-
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/example.db
 
 copy_setports ns1/named.conf.in ns1/named.conf

bin/tests/system/host/tests_sh_host.py

@@ -9,6 +9,16 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "host.err*",
+        "host.out*",
+        "ns1/example.db",
+    ]
+)
+
 
 def test_host(run_tests_sh):
     run_tests_sh()

bin/tests/system/idna/clean.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */named.memstats
-rm -f */named.run
-rm -f */named.conf
-rm -f dig.out.*
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

bin/tests/system/idna/tests_sh_idna.py

@@ -9,6 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+    ]
+)
+
 
 def test_idna(run_tests_sh):
     run_tests_sh()

bin/tests/system/include-multiplecfg/clean.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-#
-# Clean up after allow query tests.
-#
-
-rm -f ns*/named.conf
-rm -f */named.memstats
-rm -f ns*/named.lock
-rm -f ns*/named.run ns*/named.run.prev
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*

bin/tests/system/inline/clean.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -rf ./*/*.jbk \
-  ./*/*.nzd ./*/*.nzd-lock ./*/*.nzf \
-  ./*/named.conf ./*/named.memstats ./*/named.run* ./*/named.lock \
-  ./*/trusted.conf \
-  ./K* ./*/K* \
-  ./checkecdsa \
-  ./freeze.test* thaw.test* \
-  ./import.key \
-  ././ns*/managed-keys.bind* ./ns*/*.mkeys* \
-  ./*/dsset-* ./*/nzf-* \
-  ./*/*.db ./*/*.db.signed ./*/*.db.jnl ./*/*.db.signed.jnl \
-  ./*.out ./*.out* ./*/*.out ./*/*.out* \
-  ./*/*.bk ./*/*.bk.jnl ./*/*.bk.signed ./*/*.bk.signed.jnl \
-  ns3/a-file ns3/removedkeys

bin/tests/system/inline/tests_sh_inline.py

@@ -9,6 +9,33 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "K*",
+        "*.out*",
+        "freeze.test*",
+        "import.key",
+        "journalprint.out.*",
+        "thaw.test*",
+        "*/*.out*",
+        "ns*/K*",
+        "ns*/dsset-*",
+        "ns*/*.db",
+        "ns*/*.nzd",
+        "ns*/*.nzf",
+        "ns*/K*",
+        "ns*/trusted.conf",
+        "ns*/*.bk",
+        "ns*/*.jbk",
+        "ns*/*.jnl",
+        "ns*/*.signed",
+        "ns3/a-file",
+        "ns3/removedkeys",
+    ]
+)
+
 
 def test_inline(run_tests_sh):
     run_tests_sh()

bin/tests/system/inline/tests_signed_zone_files.py

@@ -12,6 +12,28 @@
 import glob
 import struct
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "K*",
+        "*.out*",
+        "*/*.out*",
+        "ns*/K*",
+        "ns*/dsset-*",
+        "ns*/*.bk",
+        "ns*/*.db",
+        "ns*/*.jbk",
+        "ns*/*.jnl",
+        "ns*/*.nzd",
+        "ns*/*.signed",
+        "ns*/trusted.conf",
+        "ns3/a-file",
+        "ns3/delayedkeys.conf",
+        "ns3/removedkeys",
+    ]
+)
+
 
 class RawFormatHeader(dict):
     """

bin/tests/system/integrity/clean.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f dig.out.test*
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f ns*/managed-keys.bind*

bin/tests/system/integrity/tests_sh_integrity.py

@@ -9,6 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+    [
+        "dig.out.*",
+    ]
+)
+
 
 def test_integrity(run_tests_sh):
     run_tests_sh()