+++ /dev/null
-#!/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*/_default.nzf
-rm -f ns*/_default.nzd*
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# 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()
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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.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.*
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):
"""
# 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()
+++ /dev/null
-#!/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.run ns*/named.run.prev
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# 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()
+++ /dev/null
-#!/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 dig.out.test*
-rm -f ns*/managed-keys.bind* ns*/*mkeys*
-rm -f ns2/example.com.bk
-rm -f ns2/example.net.bk
# 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()
+++ /dev/null
-#!/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 ./dsset-*
-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 dig.out.*
-rm -f digcomp.out.test*
-rm -f activate-now-publish-1day.key prepub.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 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 -rf ns*/inactive
-rm -f ns*/managed-keys.bind*
-rm -f ns1/root.db ns1/root.db.1 ns1/root.db.2 ns1/root.db.3
-rm -f ns1/signing.out
-rm -f ns2/bar.db
-rm -f ns2/child.nsec3.example.db
-rm -f ns2/child.optout.example.db
-rm -f ns2/example.db
-rm -f ns2/insecure.secure.example.db
-rm -f ns2/nsec3-with-ent.db
-rm -f ns2/private.secure.example.db
-rm -f ns2/signing.*
-rm -f ns3/*.nzd ns3/*.nzd-lock ns3/*.nzf
-rm -f ns3/*.nzf
-rm -f ns3/*.jbk
-rm -f ns3/autonsec3.example.db
-rm -f ns3/delay.example.db ns3/delay.example.1 ns3/delay.example.2
-rm -f ns3/delzsk.example.db
-rm -f ns3/dname-at-apex-nsec3.example.db
-rm -f ns3/inaczsk2.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 ns3/oldsigs.example.db.bak
-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/reconf.example.db
-rm -f ns3/rsasha256.example.db ns3/rsasha512.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.test*
-rm -f settime.out.*
-rm -f signing.*
-rm -f sync.key
# 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/root.db.1",
+ "ns1/root.db.2",
+ "ns1/root.db.3",
+ "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/private.conf",
+ "ns2/private.secure.example.db",
+ "ns2/signing.bar.out",
+ "ns2/signing.privsec.out",
+ "ns2/trusted.conf",
+ "ns3/autonsec3.example.db",
+ "ns3/delay.example.1",
+ "ns3/delay.example.2",
+ "ns3/delay.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/inactive",
+ "ns3/inaczsk.example.db",
+ "ns3/inaczsk2.example.db",
+ "ns3/jitter.nsec3.example.db",
+ "ns3/kg.out",
+ "ns3/kskonly.example.db",
+ "ns3/kskonly.example.db.jbk",
+ "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/oldsigs.example.db.bak",
+ "ns3/optout.example.db",
+ "ns3/optout.example.db.jbk",
+ "ns3/optout.nsec3.example.db",
+ "ns3/optout.optout.example.db",
+ "ns3/prepub.example.db",
+ "ns3/reconf.example.db",
+ "ns3/reconf.example.db.jbk",
+ "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/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):
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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.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*
# 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()
+++ /dev/null
-#!/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.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
# 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()
+++ /dev/null
-#!/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
# 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()
+++ /dev/null
-#!/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.run */ans.run
-rm -f ns2/K* ns2/dsset-* ns2/*.db.signed
-rm -f ns*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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 bad-tsig.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 good.conf.raw good.conf.out badzero.conf *.out
-rm -rf keys
-rm -rf test.keydir
# 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",
+ "bad-tsig.conf",
+ "badzero.conf",
+ "checkconf.out*",
+ "diff.out*",
+ "good-kasp.conf.in",
+ "good-server-christmas-tree.conf",
+ "good.conf",
+ "good.conf.raw",
+ "keys",
+ ]
+)
+
def test_checkconf(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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*/*.keyname
-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 ./*.out
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+
from typing import NamedTuple, Tuple
import os
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(
+ [
+ "*.out",
+ "ns*/*.db",
+ "ns*/*.db.infile",
+ "ns*/*.db.signed",
+ "ns*/*.jnl",
+ "ns*/*.jbk",
+ "ns*/*.keyname",
+ "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):
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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 zones/bad-tsig.db
-rm -f zones/zone1_*.txt
# 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()
+++ /dev/null
-#!/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.*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns*/example*.db",
+ ]
+)
+
def test_cipher_suites(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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*/managed-keys.bind*
-rm -f ns*/named.run.prev
-rm -f ans*/ans.run ans*/ans.log
# 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()
+++ /dev/null
-#!/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.*
# 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()
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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.* ./*/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*/K* ./ns*/keyid ./ns*/keydata
-rm -f ./ns1/root.db
-rm -f ./ns*/dsset-*
-rm -f ./ns2/example.db
-rm -f ./ns2/example.tld.db
-rm -f ./nslookup.out.test*
-rm -f ./nsupdate.out.test*
-rm -f ./yamlget.out.*
# 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()
+++ /dev/null
-#!/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
pytest.importorskip("dns")
import dns.message
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ans*/ans.run",
+ ]
+)
+
def test_connreset():
msg = dns.message.make_query(
+++ /dev/null
-#!/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 ns1/session.key
-rm -f ns*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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* ./*/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 ./dnssectools.out*
-rm -f ./dsfromkey.out.*
-rm -f ./keygen.err
-rm -f ./named.secroots.test*
-rm -f ./ns*/*.nta
-rm -f ./ns*/managed-keys.bind ./ns*/managed-keys.bind.jnl ./ns*/*.mkeys*
-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-update.secure.db
-rm -f ./ns2/cdnskey-update.secure.id
-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-update.secure.db ./ns2/cds-update.secure.db.jnl
-rm -f ./ns2/cds-update.secure.id
-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/settime.out.*
-rm -f ./ns2/single-nsec3.db
-rm -f ./ns2/too-many-iterations.db
-rm -f ./ns2/updatecheck-kskonly.secure.*
-rm -f ./ns3/NSEC ./ns3/NSEC3
-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
-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/revkey.example.db
-rm -f ./ns3/rsasha1-1024.example.tmp
-rm -f ./ns3/rsasha1.example.tmp
-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 ./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/*.jnl
-rm -f ./signer/general/dsset*
-rm -f ./signer/general/signed.zone
-rm -f ./signer/general/signer.err.*
-rm -f ./signer/general/signer.out.*
-rm -f ./signer/nsec3param.out
-rm -f ./signer/signer.err.*
-rm -f ./signer/signer.out.*
-rm -f ./signing.out*
# 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.*",
+ "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-update.secure.db",
+ "ns2/cdnskey-update.secure.id",
+ "ns2/cdnskey-x.secure.db",
+ "ns2/cdnskey.secure.db",
+ "ns2/cds-update.secure.db",
+ "ns2/cds-update.secure.id",
+ "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/settime.out.updatecheck-kskonly.secure.ksk",
+ "ns2/settime.out.updatecheck-kskonly.secure.zsk",
+ "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/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/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",
+ "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()
+++ /dev/null
-#!/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 ns2/dnstap.out.*
-rm -f ns2/example.db ns2/example.db.jnl
-rm -f ns3/dnstap.out.*
-rm -f ydump.out
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):
"""
# 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()
+++ /dev/null
-#!/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.*
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.
# 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()
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:
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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"""
+++ /dev/null
-#!/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*
# 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()
+++ /dev/null
-#!/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.memstats
-rm -f ns*/named.run
-rm -f ns*/root.db
-rm -f ns*/signer.err
-rm -f ns*/trusted.conf
# 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/root.db",
+ "ns1/root.db.signed",
+ "ns1/signer.err",
+ ]
+)
+
def test_ecdsa(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.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
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "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()
+++ /dev/null
-#!/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.conf
-rm -f ns*/named.run
-rm -f ns*/named.memstats
-rm -f ns*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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.run
-rm -f ns*/named.memstats
-rm -f dig.out.test*
-rm -f ns*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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 keyfromlabel.err.* keyfromlabel.out.*
-rm -f pkcs11-tool.err.* pkcs11-tool.out.*
-rm -f signer.out.*
-rm -f ns*/*.kskid1 ns*/*.kskid2 ns*/*.zskid1 ns/*.zskid2
-rm -f ns*/dig.out.*
-rm -f ns*/K*
-rm -f ns*/keygen.out.*
-rm -f ns*/named.conf ns1/named.run ns1/named.memstats
-rm -f ns*/pin
-rm -f ns*/update.cmd.*
-rm -f ns*/update.log.*
-rm -f ns*/verify.out.*
-rm -f ns*/zone.*.jnl ns1/zone.*.jbk
-rm -f ns1/*.example.db ns1/*.example.db.signed
-rm -f ns1/*.kasp.db ns1/*.kasp.db.signed
-rm -f ns1/*.split.db ns1/*.split.db.signed
-rm -f ns2/*.views.db ns1/*.views.db.signed
-rm -rf ./ns1/keys/
-rm -rf ./ns2/keys/
-
-OPENSSL_CONF= softhsm2-util --delete-token --token "softhsm2-enginepkcs11" >/dev/null 2>&1 || echo_i "softhsm2-enginepkcs11 token not found for cleaning"
$SHELL clean.sh
+OPENSSL_CONF= softhsm2-util --delete-token --token "softhsm2-enginepkcs11" >/dev/null 2>&1 || true
OPENSSL_CONF= 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}" >ns1/pin
# 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.*",
+ "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/keys",
+ "ns1/*.example.db",
+ "ns1/*.example.db.signed",
+ "ns1/*.kasp.db",
+ "ns1/*.kasp.db.signed",
+ "ns1/*.split.db",
+ "ns1/*.split.db.signed",
+ "ns1/*.weird.db",
+ "ns1/*.weird.db.signed",
+ "ns2/keys",
+ "ns2/*.view*.db",
+ "ns2/*.view*.db.signed",
+ ]
+)
+
@isctest.mark.flaky(max_runs=3) # GL#4605
def test_enginepkcs11(run_tests_sh):
+++ /dev/null
-#!/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
# 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.stats",
+ "ns3/named.stats.prev",
+ "ns5/named.stats",
+ ]
+)
+
import isctest.mark
+++ /dev/null
-#!/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*/managed-keys.bind*
-
-rm -f ns*/trusted.conf
-rm -f ns*/keygen.out
# 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()
+++ /dev/null
-#!/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 optwrongname.out
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.conf
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-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
# 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()
+++ /dev/null
-#!/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 ./*/named.conf
-rm -f ./*/named.memstats
-rm -f ./*/named.run ./*/named.run.prev ./*/ans.run
-rm -f ./*/named_dump.db
-rm -f ./ans*/query.log
-rm -f ./statschannel.out.*
-rm -f ./dig.out.*
-rm -f ./ns*/managed-keys.bind*
-rm -f ./ns*/trusted.conf
-rm -f ./ns1/K* ./ns1/dsset-*
-rm -f ./ns1/root.db ./ns1/root.db.signed
-rm -f ns2/named-tls.conf
-rm -f ns2/options-tls.conf
-rm -f ns4/named-tls.conf
-rm -f ns4/options-tls.conf
# 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",
+ "ns2/named-tls.conf",
+ "ns2/options-tls.conf",
+ "ns3/trusted.conf",
+ "ns4/named-tls.conf",
+ "ns4/options-tls.conf",
+ "ns9/named_dump.db",
+ ]
+)
+
def test_forward(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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*/managed-keys.bind* ns*/*.mkeys*
# 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()
+++ /dev/null
-#!/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*/K*
-rm -f ns*/dsset-*
-rm -f ns*/managed-keys.bind*
-rm -f ns*/tc-test-signed.db
-rm -f ns*/tc-test-signed.db.signed
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+
import dns.message
+import pytest
import isctest
-import pytest
-
pytest.importorskip("dns", minversion="2.0.0")
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns1/*",
+ "ns1/dsset-*",
+ "ns1/tc-test-signed.db",
+ "ns1/tc-test-signed.db.signed",
+ ]
+)
+
def test_glue_full_glue_set():
"""test that a ccTLD referral gets a full glue set from the root zone"""
+++ /dev/null
-#!/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
+++ /dev/null
-#!/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.memstats
-rm -f ns*/named.run
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
. ../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
# 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()
+++ /dev/null
-#!/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*/managed-keys.bind*
# 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()
+++ /dev/null
-#!/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.run ns*/named.run.prev
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
+++ /dev/null
-#!/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* \
- ./*/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 ns3/delayedkeys.conf
# 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/delayedkeys.conf",
+ "ns3/removedkeys",
+ ]
+)
+
def test_inline(run_tests_sh):
run_tests_sh()
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/delayedkeys.conf",
+ "ns3/removedkeys",
+ ]
+)
+
class RawFormatHeader(dict):
"""
+++ /dev/null
-#!/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*
# 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()
+++ /dev/null
-#!/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 stats.*
-rm -f ns1/*.db ns1/*.jnl
-rm -f ns3/*.jnl ns3/mytest*.db ns3/subtest*.db
-rm -f ns4/*.jnl ns4/*.db
-rm -f ns5/*.jnl ns5/*.db
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run */named.run.prev
-rm -f */ans.run
-rm -f dig.out.test* dig.out1.test* dig.out2.test* dig.out3.test*
-rm -f ns3/large.db
-rm -f ns*/managed-keys.bind* ns*/*.mkeys
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out*",
+ "stats.*",
+ "ans*/ans.run",
+ "ns*/*.jnl",
+ "ns1/named.run.prev*",
+ "ns1/myftp.db",
+ "ns3/large.db",
+ "ns3/mytest*.db",
+ "ns3/subtest*.db",
+ "ns4/mytest.db",
+ "ns4/subtest.db",
+ "ns5/mytest.db",
+ "ns5/subtest.db",
+ ]
+)
+
def test_ixfr(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 */*.db */*.jnl
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run
-rm -f dig.out*
-rm -f journalprint.out.*
-rm -f ns1/managed-keys.bind
-rm -f ns2/managed-keys.bind
-rm -f tmp.jnl
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "journalprint.out.*",
+ "tmp.jnl",
+ "ns*/*.db",
+ "ns*/*.jnl",
+ "ns1/managed-keys.bind",
+ "ns2/managed-keys.bind",
+ ]
+)
+
def test_journal(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ./keygen.*
-rm -f ./K*.private ./K*.key ./K*.state ./K*.cmp
-rm -rf ./keys/
-rm -f dig.out* rrsig.out.* keyevent.out.* verify.out.* zone.out.*
-rm -f ns*/named.conf ns*/named.memstats ns*/named.run*
-rm -f ns*/named-fips.conf
-rm -f ns*/policies/*.conf
-rm -f ns*/*.jnl ns*/*.jbk
-rm -f ns*/K*.private ns*/K*.key ns*/K*.state
-rm -f ns*/dsset-* ns*/*.db ns*/*.db.signed
-rm -f ns*/keygen.out.* ns*/settime.out.* ns*/signer.out.*
-rm -f ns*/managed-keys.bind
-rm -f ns*/*.mkeys
-rm -f ns*/zones ns*/*.db.infile
-rm -f ns*/*.zsk1 ns*/*.zsk2
-rm -f ns3/legacy-keys.*
-rm -rf ns3/keys/
-rm -f *.created published.test* retired.test*
-rm -f rndc.dnssec.*.out.* rndc.zonestatus.out.*
-rm -f python.out.*
-rm -f created.key-* unused.key-*
-rm -f ns3/ksk/K* ns3/zsk/K*
-rm -rf ./ns3/ksk/ ./ns3/zsk/
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "K*.private",
+ "K*.key",
+ "K*.state",
+ "K*.cmp",
+ "*.created",
+ "dig.out*",
+ "keyevent.out.*",
+ "keygen.out.*",
+ "keys",
+ "published.test*",
+ "python.out.*",
+ "retired.test*",
+ "rndc.dnssec.*.out.*",
+ "rndc.zonestatus.out.*",
+ "rrsig.out.*",
+ "created.key-*",
+ "unused.key-*",
+ "verify.out.*",
+ "zone.out.*",
+ "ns*/K*.private",
+ "ns*/K*.key",
+ "ns*/K*.state",
+ "ns*/*.db",
+ "ns*/*.db.infile",
+ "ns*/*.db.signed",
+ "ns*/*.jbk",
+ "ns*/*.jnl",
+ "ns*/dsset-*",
+ "ns*/keygen.out.*",
+ "ns*/keys",
+ "ns*/ksk",
+ "ns*/ksk/K*",
+ "ns*/zsk",
+ "ns*/zsk",
+ "ns*/zsk/K*",
+ "ns*/named-fips.conf",
+ "ns*/settime.out.*",
+ "ns*/signer.out.*",
+ "ns*/zones",
+ "ns*/policies/*.conf",
+ "ns*/*.zsk1",
+ "ns*/*.zsk2",
+ "ns3/legacy-keys.*",
+ "ns3/dynamic-signed-inline-signing.kasp.db.signed.signed",
+ ]
+)
+
def test_kasp(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 output
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/named.conf
-rm -f ns*/named.stats
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "output",
+ "ns2/named.stats",
+ ]
+)
+
def test_keepalive(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 K*
-rm -f pin
-rm -f dsset-*
-rm -f *.example.db *.example.db.signed
-rm -f keyfromlabel.out.*
-rm -f pkcs11-tool.out.*
-rm -f signer.out.*
-
-OPENSSL_CONF= softhsm2-util --delete-token --token "softhsm2-keyfromlabel" >/dev/null 2>&1 || echo_i "softhsm2-keyfromlabel token not found for cleaning"
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "*.example.db",
+ "*.example.db.signed",
+ "K*",
+ "dsset-*",
+ "keyfromlabel.out.*",
+ "pin",
+ "pkcs11-tool.out.*",
+ "signer.out.*",
+ ]
+)
+
def test_keyfromlabel(run_tests_sh):
run_tests_sh()
import time
from typing import List, Optional
+import pytest
+
import isctest
from isctest.kasp import (
Key,
KeyTimingMetadata,
)
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "K*",
+ "common.test.*",
+ "future.test.*",
+ "in-the-middle.test.*",
+ "ksk-roll.test.*",
+ "last-bundle.test.*",
+ "past.test.*",
+ "two-tone.test.*",
+ "unlimited.test.*",
+ "ns1/K*",
+ "ns1/_default.nzd",
+ "ns1/_default.nzf",
+ "ns1/common.test.db",
+ "ns1/common.test.db.jbk",
+ "ns1/common.test.db.signed",
+ "ns1/common.test.db.signed.jnl",
+ "ns1/common.test.skr.2",
+ "ns1/future.test.db",
+ "ns1/future.test.db.jbk",
+ "ns1/future.test.db.signed",
+ "ns1/future.test.skr.1",
+ "ns1/in-the-middle.test.db",
+ "ns1/in-the-middle.test.db.jbk",
+ "ns1/in-the-middle.test.db.signed",
+ "ns1/in-the-middle.test.db.signed.jnl",
+ "ns1/in-the-middle.test.skr.1",
+ "ns1/keydir",
+ "ns1/ksk-roll.test.db",
+ "ns1/ksk-roll.test.db.jbk",
+ "ns1/ksk-roll.test.db.signed",
+ "ns1/ksk-roll.test.db.signed.jnl",
+ "ns1/ksk-roll.test.skr.1",
+ "ns1/last-bundle.test.db",
+ "ns1/last-bundle.test.db.jbk",
+ "ns1/last-bundle.test.db.signed",
+ "ns1/last-bundle.test.db.signed.jnl",
+ "ns1/last-bundle.test.skr.1",
+ "ns1/offline",
+ "ns1/past.test.db",
+ "ns1/past.test.db.jbk",
+ "ns1/past.test.db.signed",
+ "ns1/past.test.skr.1",
+ "ns1/two-tone.test.db",
+ "ns1/two-tone.test.db.jbk",
+ "ns1/two-tone.test.db.signed",
+ "ns1/two-tone.test.db.signed.jnl",
+ "ns1/two-tone.test.skr.1",
+ "ns1/unlimited.test.db",
+ "ns1/unlimited.test.db.jbk",
+ "ns1/unlimited.test.db.signed",
+ "ns1/unlimited.test.db.signed.jnl",
+ "ns1/unlimited.test.unlimited.skr.1",
+ ]
+)
+
def between(value, start, end):
if value is None or start is None or end is None:
+++ /dev/null
-#!/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.conf
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-
-# build.sh
-rm -f ns1/named_dump.db*
-rm -f ns6/K*
-rm -f ns6/dsset-*
-rm -f ns6/edns512.db
-rm -f ns6/signer.err
-rm -f ns7/K*
-rm -f ns7/dsset-*
-rm -f ns7/edns512-notcp.db
-rm -f ns7/signer.err
-rm -f ns7/trusted.conf
-rm -f ns*/managed-keys.bind*
# 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_legacy(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 limits tests.
-#
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f ns*/managed-keys.bind*
+++ /dev/null
-#!/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 log file tests
-#
-rm -f ns1/named.conf
-rm -f ns1/named.args
-rm -f ns1/named.pid ns1/named.run ns1/named.run.prev
-rm -f ns1/named.memstats ns1/dig.out
-rm -f ns1/named_log ns1/named_pipe ns1/named_sym
-rm -rf ns1/named_dir
-rm -f ns1/named_deflog
-rm -f ns1/query_log
-rm -f ns1/named_iso8601
-rm -f ns1/named_iso8601_utc
-rm -f ns1/rndc.out.test*
-rm -f ns1/dig.out.test*
-rm -f ns1/named_vers
-rm -f ns1/named_vers.*
-rm -f ns1/named_ts
-rm -f ns1/named_ts.*
-rm -f ns1/named_inc
-rm -f ns1/named_inc.*
-rm -f ns1/named_unlimited
-rm -f ns1/named_unlimited.*
-rm -f ns*/managed-keys.bind*
# 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.*",
+ "ns1/named.args",
+ "ns1/named_deflog",
+ "ns1/named_inc*",
+ "ns1/named_iso8601",
+ "ns1/named_iso8601_utc",
+ "ns1/named_log",
+ "ns1/named_pipe",
+ "ns1/named_sym",
+ "ns1/named_ts*",
+ "ns1/named_unlimited*",
+ "ns1/named_vers*",
+ "ns1/query_log*",
+ ]
+)
+
def test_logfileconfig(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.conf
-rm -f */named.run
-rm -f ns*/managed-keys.bind*
+++ /dev/null
-#!/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.raw*
-rm -f ./ns1/example.db.compat
-rm -f ./ns1/example.db.serial.raw
-rm -f ./ns1/large.db ./ns1/large.db.raw
-rm -f ./ns1/signed.db.raw
-rm -f ./ns1/session.key
-rm -f ./ns1/signed.db.raw.jbk
-rm -f ./ns1/signed.db.raw.signed
-rm -f ./ns1/signed.db.raw.signed.jnl
-rm -f ./dig.out.*
-rm -f ./dig.out
-rm -f ./*/named.memstats
-rm -f ./*/named.conf
-rm -f ./*/named.run
-rm -f ./ns2/example.db
-rm -f ./ns2/transfer.db.*
-rm -f ./ns2/formerly-text.db
-rm -f ./ns2/db-*
-rm -f ./ns2/large.bk
-rm -f ./ns3/example.db.raw ./ns3/dynamic.db.raw
-rm -f ./baseline.txt ./text.* ./raw.*
-rm -f ./ns1/Ksigned.* ./ns1/dsset-signed. ./ns1/signed.db.signed
-rm -f ./rndc.out
-rm -f ./ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "baseline.txt",
+ "dig.out.*",
+ "raw.*",
+ "rndc.out*",
+ "text.*",
+ "ns*/*.raw*",
+ "ns*/*.jbk",
+ "ns*/*.jnl",
+ "ns*/*.signed",
+ "ns*/dsset-*",
+ "ns*/K*",
+ "ns1/255types.db",
+ "ns1/example.db.compat",
+ "ns1/on-limit-kasp.db",
+ "ns1/on-limit.db",
+ "ns1/over-limit.db",
+ "ns1/under-limit-kasp.db",
+ "ns1/under-limit.db",
+ "ns2/db-*",
+ "ns2/example.db",
+ "ns2/formerly-text.db",
+ "ns2/transfer.db.full",
+ "ns2/transfer.db.txt",
+ "ns2/under-limit-kasp.bk",
+ "ns2/under-limit.bk",
+ ]
+)
+
def test_masterformat(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 *.new
-rm -f zsk.key ksk.key parent.ksk.key parent.zsk.key
-rm -f pending.key rolling.key standby.key inact.key
-rm -f prerev.key postrev.key oldstyle.key
-rm -f keys sigs
-rm -f tmp.out
-rm -f settime1.test* settime2.test*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "*.new",
+ "*.signed",
+ "K*",
+ "dsset-*",
+ "inact.key",
+ "keys",
+ "ksk.key",
+ "oldstyle.key",
+ "parent.ksk.key",
+ "parent.zsk.key",
+ "pending.key",
+ "postrev.key",
+ "prerev.key",
+ "rolling.key",
+ "settime*.test*",
+ "sigs",
+ "standby.key",
+ "tmp.out",
+ "zsk.key",
+ ]
+)
+
def test_metadata(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 */*.conf
-rm -f */*.db
-rm -f */*.jnl
-rm -f */*.mirror
-rm -f */*.nzd*
-rm -f */*.prev
-rm -f */*.signed
-rm -f */K*
-rm -f */db-*
-rm -f */dsset-*
-rm -f */jn-*
-rm -f */_default.nzf
-rm -f */managed-keys.bind*
-rm -f */named.memstats
-rm -f */named.run
-rm -f dig.out.*
-rm -f rndc.out.*
# 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.*",
+ "ns*/db-*",
+ "ns*/dsset-*",
+ "ns*/jn-*",
+ "ns*/K*",
+ "ns*/*.conf",
+ "ns*/*.db",
+ "ns*/*.jnl",
+ "ns*/*.mirror",
+ "ns*/*.nzf*",
+ "ns*/*.nzd*",
+ "ns*/*.signed",
+ ]
+)
+
def test_mirror(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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* */*.signed */trusted.conf */*.jnl */*.bk
-rm -f */island.conf
-rm -f */private.conf
-rm -f */managed*.conf ns1/managed.key ns1/managed.key.id
-rm -f */managed-keys.bind* */named.secroots
-rm -f */named.conf
-rm -f */named.memstats */named.run */named.run.prev
-rm -f dig.out* delv.out* rndc.out* signer.out*
-rm -f dsset-. ns1/dsset-.
-rm -f ns*/managed-keys.bind*
-rm -f ns1/dsset-sub.tld.
-rm -f ns1/dsset-tld.
-rm -f ns1/named.secroots ns1/root.db.signed* ns1/root.db.tmp
-rm -f ns1/signer.out.*
-rm -f ns1/zone.key
-rm -f ns3/broken.conf
-rm -f ns4/dsset-sub.foo.
-rm -f ns5/named.args
-rm -f ns7/view1.mkeys ns7/view2.mkeys
-rm -rf ns4/nope
import pytest
-pytestmark = pytest.mark.algorithm_set("ecc_default")
+pytestmark = [
+ pytest.mark.algorithm_set("ecc_default"),
+ pytest.mark.extra_artifacts(
+ [
+ "delv.*",
+ "dig.out.*",
+ "dsset-*",
+ "rndc.out.*",
+ "signer.out.*",
+ "ns*/dsset-*",
+ "ns*/*.bk",
+ "ns*/*.jnl",
+ "ns*/K*",
+ "ns*/island.conf",
+ "ns*/managed.conf",
+ "ns*/named.secroots",
+ "ns*/private.conf",
+ "ns*/signer.out.*",
+ "ns*/trusted.conf",
+ "ns*/*.signed",
+ "ns1/managed.key",
+ "ns1/managed.key.id",
+ "ns1/root.db.orig",
+ "ns1/root.db.tmp",
+ "ns1/zone.key",
+ "ns2/managed-keys.bind",
+ "ns3/broken.conf",
+ "ns3/managed-keys.bind",
+ "ns4/nope",
+ "ns5/managed-keys.bind",
+ "ns5/named.args",
+ "ns7/view1.mkeys",
+ "ns7/view2.mkeys",
+ ]
+ ),
+]
def test_mkeys(run_tests_sh):
+++ /dev/null
-#!/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 *.created
-rm -f cdnskey.ns*
-rm -f cds.ns*
-rm -f secondary.cdnskey.ns*
-rm -f secondary.cds.ns*
-rm -f created.key-*
-rm -f dig.out.*
-rm -f python.out.*
-rm -f rndc.dnssec.status.out.*
-rm -f unused.key-*
-rm -f verify.out.*
-
-rm -f ns*/*.jbk
-rm -f ns*/*.jnl
-rm -f ns*/*.journal.out.test*
-rm -f ns*/*.signed
-rm -f ns*/*.signed.jnl
-rm -f ns*/*.zsk
-rm -f ns*/db-*
-rm -f ns*/K*
-rm -f ns*/keygen.out.*
-rm -f ns*/managed-keys*
-rm -f ns*/model2.secondary.db
-rm -f ns*/model2.secondary.db
-rm -f ns*/named.conf
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/settime.out.*
set -e
-$SHELL clean.sh
-
copy_setports ns3/named.conf.in ns3/named.conf
copy_setports ns4/named.conf.in ns4/named.conf
copy_setports ns5/named.conf.in ns5/named.conf
# 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.*",
+ "ns*/K*",
+ "ns*/db-*",
+ "ns*/keygen.out.*",
+ "ns*/*.jbk",
+ "ns*/*.jnl",
+ "ns*/*.zsk",
+ "ns*/*.signed",
+ "ns*/*.journal.out.*",
+ "ns*/settime.out.*",
+ "ns*/model2.secondary.db",
+ ]
+)
+
def test_multisigner(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.*.test*
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/named.pid
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.*.test*",
+ ]
+)
+
def test_names(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.port
-rm -f ./*/named.run ./*/named.run.prev
-rm -f awk.out.ns?.test*
-rm -f dig.out.?.ns5.test*
-rm -f dig.out.ns2.test*
-rm -f dig.out.ns3.test*
-rm -f dig.out.ns4.test*
-rm -f log.out
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ns2/example.db
-rm -f ns2/x21.db*
-rm -f ns3/example.bk
-rm -f ns4/x21.bk*
-rm -f ns5/x21.bk-b
-rm -f ns5/x21.bk-b.jnl
-rm -f ns5/x21.bk-c
-rm -f ns5/x21.bk-c.jnl
-rm -f ns5/x21.db.jnl
-rm -f tmp
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "awk.out.*",
+ "dig.out.*",
+ "ns2/example.db",
+ "ns2/named-tls.conf",
+ "ns2/options-tls.conf",
+ "ns2/x21.db*",
+ "ns3/example.bk",
+ "ns3/named-tls.conf",
+ "ns3/options-tls.conf",
+ "ns4/named.port",
+ "ns4/x21.bk",
+ "ns4/x21.bk.jnl",
+ "ns5/x21.bk-b",
+ "ns5/x21.bk-b.jnl",
+ "ns5/x21.bk-c",
+ "ns5/x21.bk-c.jnl",
+ "ns5/x21.db.jnl",
+ ]
+)
+
def test_notify(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 created.key-* *.created unused.key-*
-rm -f dig.out.* rndc.reload.* rndc.signing.* update.out.* verify.out.*
-rm -f ns*/*.jnl ns*/*.jbk ns*/managed-keys.bind
-rm -f ns*/K*.private ns*/K*.key ns*/K*.state
-rm -f ns*/dsset-* ns*/*.db ns*/*.db.signed
-rm -f ns*/keygen.out.* ns*/settime.out.*
-rm -f ns*/named.conf ns*/named.memstats ns*/named.run*
-rm -f ns3/named-fips.conf
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "*.created",
+ "dig.out.*",
+ "rndc.reload.*",
+ "rndc.signing.*",
+ "update.out.*",
+ "verify.out.*",
+ "ns*/dsset-**",
+ "ns*/K*",
+ "ns*/settime.out.*",
+ "ns*/*.db",
+ "ns*/*.jbk",
+ "ns*/*.jnl",
+ "ns*/*.signed",
+ "ns*/keygen.out.*",
+ "ns3/named-fips.conf",
+ ]
+)
+
def test_nsec3(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 nslookup.out*
-rm -f nslookup.err*
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "nslookup.err*",
+ "nslookup.out*",
+ "ns1/example.db",
+ ]
+)
+
def test_nslookup(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 */*.jnl
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run */ans.run
-rm -f */named.run.prev
-rm -f Kxxx.*
-rm -f check.out.*
-rm -f dig.out.*
-rm -f jp.out.ns3.*
-rm -f keygen.out.*
-rm -f nextpart.out.*
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ns1/example.db ns1/unixtime.db ns1/yyyymmddvv.db ns1/update.db ns1/other.db ns1/keytests.db
-rm -f ns1/legacy157.key ns1/legacy161.key ns1/legacy162.key ns1/legacy163.key ns1/legacy164.key ns1/legacy165.key
-rm -f ns1/many.test.db
-rm -f ns1/maxjournal.db
-rm -f ns1/md5.key ns1/sha1.key ns1/sha224.key ns1/sha256.key ns1/sha384.key
-rm -f ns1/sample.db
-rm -f ns1/sha512.key ns1/ddns.key
-rm -f ns1/tls.conf
-rm -f ns1/tls.options
-rm -f ns10/_default.tsigkeys
-rm -f ns10/example.com.db
-rm -f ns10/in-addr.db
-rm -f ns2/example.bk
-rm -f ns2/sample.db
-rm -f ns2/update.bk ns2/update.alt.bk
-rm -f ns3/*.signed
-rm -f ns3/K*
-rm -f ns3/delegation.test.db
-rm -f ns3/dnskey.test.db
-rm -f ns3/dsset-*
-rm -f ns3/example.db
-rm -f ns3/many.test.bk
-rm -f ns3/multisigner.test.db
-rm -f ns3/nsec3param.test.db
-rm -f ns3/relaxed.db
-rm -f ns3/too-big.test.db
-rm -f ns5/local.db
-rm -f ns6/2.0.0.2.ip6.addr.db
-rm -f ns6/in-addr.db
-rm -f ns7/_default.tsigkeys
-rm -f ns7/example.com.db
-rm -f ns7/in-addr.db
-rm -f ns8/_default.tsigkeys
-rm -f ns8/example.com.db
-rm -f ns8/in-addr.db
-rm -f ns9/_default.tsigkeys
-rm -f ns9/denyname.example.db
-rm -f ns9/example.com.db
-rm -f ns9/in-addr.db
-rm -f nsupdate.alg-*
-rm -f nsupdate.out*
-rm -f perl.update_test.out
-rm -f policy.expected.*
-rm -f policy.log*
-rm -f typelist.out.*
-rm -f update.in.*
-rm -f update.out.*
-rm -f verylarge
import platform
+import pytest
+
import isctest.mark
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "Kxxx*",
+ "dig.out.*",
+ "nextpart.out.*",
+ "nsupdate.*out*",
+ "policy.expected.*",
+ "policy.log*",
+ "perl.update_test.out",
+ "typelist.out.*",
+ "update.in.*",
+ "verylarge",
+ "ans*/ans.run",
+ "ns*/*.jnl",
+ "ns*/*.jnl",
+ "ns1/ddns.key",
+ "ns1/example.db",
+ "ns1/keytests.db",
+ "ns1/legacy*.key",
+ "ns1/many.test.db",
+ "ns1/maxjournal.db",
+ "ns1/md5.key",
+ "ns1/other.db",
+ "ns1/sample.db",
+ "ns1/sha*.key",
+ "ns1/tls.conf",
+ "ns1/tls.options",
+ "ns1/unixtime.db",
+ "ns1/update.db",
+ "ns1/yyyymmddvv.db",
+ "ns2/example.bk",
+ "ns2/sample.db",
+ "ns2/update.alt.bk",
+ "ns2/update.bk",
+ "ns3/dsset-*",
+ "ns3/K*",
+ "ns3/*.signed",
+ "ns3/delegation.test.db",
+ "ns3/dnskey.test.db",
+ "ns3/example.db",
+ "ns3/multisigner.test.db",
+ "ns3/nsec3param.test.db",
+ "ns3/relaxed.db",
+ "ns3/too-big.test.db",
+ "ns5/local.db",
+ "ns6/2.0.0.2.ip6.addr.db",
+ "ns6/in-addr.db",
+ "ns7/_default.tsigkeys",
+ "ns7/example.com.db",
+ "ns7/in-addr.db",
+ "ns8/_default.tsigkeys",
+ "ns8/example.com.db",
+ "ns8/in-addr.db",
+ "ns9/_default.tsigkeys",
+ "ns9/denyname.example.db",
+ "ns9/example.com.db",
+ "ns9/in-addr.db",
+ "ns10/_default.tsigkeys",
+ "ns10/example.com.db",
+ "ns10/in-addr.db",
+ ]
+)
+
MAX_RUNS = 2 if platform.system() == "FreeBSD" else 1 # GL#3846
+++ /dev/null
-#!/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.run
-rm -f ./*/named.memstats
-rm -f dig.out.*
-rm -f rndc.out*
-rm -f ns*/*.nzf
-rm -f ns*/*.nzd ns*/*.nzd-lock
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns*/*.nzd",
+ "ns*/*.nzf*",
+ ]
+)
+
def test_nzd2nzf(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.memstats
-rm -f ns*/named.run
-rm -f ns*/named.stats
-rm -f ns*/named.stats.prev
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns2/named.stats*",
+ ]
+)
+
def test_padding(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 */*.signed
-rm -rf */*.jnl
-rm -rf */K*
-rm -rf */dsset-*
-rm -rf */named.memstats
-rm -rf */named.run
-rm -rf */trusted.conf
-rm -rf ns1/root.db
-rm -rf ns2/example.db
-rm -rf ns2/example.com.db
-rm -rf nsupdate.out.test
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "nsupdate.out.*",
+ "ns*/dsset-*",
+ "ns*/K*",
+ "ns*/*.jnl",
+ "ns*/*.signed",
+ "ns*/trusted.conf",
+ "ns*/K*",
+ "ns1/root.db",
+ "ns2/example.com.db",
+ "ns2/example.db",
+ ]
+)
+
def test_pending(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 raw* output* ./*.out.*
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "output*",
+ "raw*",
+ "ans*/ans.run",
+ ]
+)
+
def test_pipelined(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ./*/example.db
-rm -rf ./headers.*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns*/example.db",
+ ]
+)
+
def test_proxy(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 */named.run.prev
-rm -f ans*/query.log*
-rm -f dig.out.*
-rm -f named.run.*
-rm -f ns*/named.conf
-rm -f query*.log
# 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.*",
+ "named.run.*",
+ "query*.log",
+ "ans*/ans.run",
+ "ans*/query.log*",
+ ]
+)
+
# The qmin test is inherently unstable, see GL #904 for details.
@isctest.mark.flaky(max_runs=3)
+++ /dev/null
-#!/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 ans?/ans.run
-rm -f ans2/ans.limit
-rm -f ans4/ans.limit
-rm -f ns?/named.memstats
-rm -f ns?/named.run
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
-rm -f ns*/signed.db*
-rm -f ns*/*.db.signed
# 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-signed.",
+ "ans*/ans.limit",
+ "ans*/ans.run",
+ "ns1/K*",
+ "ns1/signed.db",
+ "ns1/signed.db.signed",
+ ]
+)
+
# The reclimit is known to be quite unstable. GL #1587
@isctest.mark.flaky(max_runs=2)
+++ /dev/null
-#!/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.stats
-rm -f dig.out.*
-rm -f ns1/K*
-rm -f ns1/dsset-nsec3.
-rm -f ns1/dsset-signed.
-rm -f ns1/nsec3.db*
-rm -f ns1/signed.db*
-rm -f ns2/*.db
-rm -f ns3/K*
-rm -f ns3/dsset-nsec3.
-rm -f ns3/dsset-signed.
-rm -f ns3/nsec3.db*
-rm -f ns3/signed.db*
-rm -f ns4/*.db
-rm -f ns5/dsset-*
-rm -f ns5/K* ns5/sign.ns5.*
-rm -f ns5/root.db ns5/root.db.signed
-rm -f ns5/signed.db ns5/signed.db.signed
-rm -f ns6/signed.db.signed
-rm -f rndc.out
-rm -f ns*/managed-keys.bind*
# 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/*.signed",
+ "ns1/dsset-nsec3.",
+ "ns1/dsset-signed.",
+ "ns1/nsec3.db",
+ "ns1/signed.db",
+ "ns2/example.db",
+ "ns2/named.stats",
+ "ns2/redirect.db",
+ "ns3/K*",
+ "ns3/*.signed",
+ "ns3/dsset-nsec3.",
+ "ns3/dsset-signed.",
+ "ns3/nsec3.db",
+ "ns3/signed.db",
+ "ns4/example.db",
+ "ns4/named.stats",
+ "ns5/K*",
+ "ns5/dsset-*",
+ "ns5/*.signed",
+ "ns5/root.db",
+ "ns5/sign.ns5.*",
+ "ns5/signed.db",
+ "ns6/signed.db.signed",
+ ]
+)
+
def test_redirect(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 resolver tests.
-#
-rm -f ./*/named.conf
-rm -f ./*/named.memstats
-rm -f ./*/named.run ./*/named.run.prev
-rm -f ./*/ans.run
-rm -f ./*/*.jdb
-rm -f dig.out dig.out.* dig.*.out.*
-rm -f dig.*.foo.*
-rm -f dig.*.bar.*
-rm -f dig.*.prime.*
-rm -f nextpart.out.*
-rm -f ns4/tld.db
-rm -f ns6/K*
-rm -f ns6/example.net.db.signed ns6/example.net.db
-rm -f ns6/ds.example.net.db.signed ns6/ds.example.net.db
-rm -f ns6/dsset-ds.example.net*
-rm -f ns6/dsset-example.net* ns6/example.net.db.signed.jnl
-rm -f ns6/named.stats*
-rm -f ns6/to-be-removed.tld.db ns6/to-be-removed.tld.db.jnl
-rm -f ns7/server.db ns7/server.db.jnl
-rm -f resolve.out.*.test*
-rm -f .digrc
-rm -f ns5/trusted.conf
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ ".digrc",
+ "dig*.out*",
+ "dig.*.foo.*",
+ "dig.*.bar.*",
+ "dig.*.prime.*",
+ "nextpart.out.*",
+ "ans*/ans.run",
+ "ans*/query.log",
+ "ns4/tld.db",
+ "ns5/trusted.conf",
+ "ns6/K*",
+ "ns6/ds.example.net.db",
+ "ns6/ds.example.net.db.signed",
+ "ns6/dsset-ds.example.net.",
+ "ns6/dsset-example.net.",
+ "ns6/example.net.db",
+ "ns6/example.net.db.signed",
+ "ns6/example.net.db.signed.jnl",
+ "ns6/to-be-removed.tld.db",
+ "ns6/to-be-removed.tld.db.jnl",
+ "ns7/server.db",
+ "ns7/server.db.jnl",
+ ]
+)
+
def test_resolver(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ns*/*.nta
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
-rm -f ns*/named.conf
-rm -f ns*/named.memstats
-rm -f ns*/named.run ns*/named.run.prev
-rm -f ns2/named.stats
-rm -f ns2/named_dump.db*
-rm -f ns2/nil.db ns2/other.db ns2/static.db ns2/*.jnl
-rm -f ns2/secondkey.conf
-rm -f ns2/session.key
-rm -f ns3/named_dump.db*
-rm -f ns4/*.nta
-rm -f ns4/example.db ns4/example.db.jnl
-rm -f ns4/key?.conf
-rm -f ns6/huge.zone.db
-rm -f ns7/include.db ns7/test.db ns7/*.jnl
-rm -f ns7/named_dump.db*
-rm -f nsupdate.out.*.test*
-rm -f nsupdate.out.test*
-rm -f python.out.*.test*
-rm -f rndc.out.*.test*
-rm -f rndc.out.test*
pytest.importorskip("dns")
import dns.message
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns2/nil.db",
+ "ns2/other.db",
+ "ns2/secondkey.conf",
+ "ns2/static.db",
+ "ns4/example.db",
+ "ns4/key*.conf",
+ "ns6/huge.zone.db",
+ "ns7/include.db",
+ "ns7/test.db",
+ ]
+)
+
def test_cve_2023_3341(control_port):
depth = 4500
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
-def test_rndc(run_tests_sh):
- run_tests_sh()
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "nsupdate.out.*",
+ "rndc.out.*",
+ "ns2/*.jnl",
+ "ns2/named.stats",
+ "ns2/named_dump.db.*",
+ "ns2/nil.db",
+ "ns2/other.db",
+ "ns2/secondkey.conf",
+ "ns2/static.db",
+ "ns3/all.nta",
+ "ns3/named_dump.db.*",
+ "ns3/none.nta",
+ "ns4/example.db",
+ "ns4/example.db.jnl",
+ "ns4/key*.conf",
+ "ns4/normal.nta",
+ "ns4/view with a space.nta",
+ "ns6/huge.zone.db",
+ "ns7/include.db",
+ "ns7/test.db",
+ "ns7/test.db.jnl",
+ ]
+)
+++ /dev/null
-#!/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.ns?.test*
-rm -f */dsset-*
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run
-rm -f */trusted.conf
-rm -f ns1/K.*
-rm -f ns1/root.db
-rm -f ns1/root.db.signed
-rm -f ns2/Kexample.*
-rm -f ns2/example.db
-rm -f ns2/example.db.signed
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns*/dsset-*",
+ "ns*/trusted.conf",
+ "ns1/K*",
+ "ns1/root.db",
+ "ns1/root.db.signed",
+ "ns2/Kexample*",
+ "ns2/example.db",
+ "ns2/example.db.signed",
+ ]
+)
+
def test_rootkeysentinel(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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*/*.key ns*/*.private
-rm -f ns2/tld2s.db */bl.tld2.db */bl.tld2s.db
-rm -f ns3/bl*.db ns3/fast-expire.db ns*/empty.db
-rm -f ns3/manual-update-rpz.db
-rm -f ns3/mixed-case-rpz.db
-rm -f ns5/example.db ns5/bl.db ns5/fast-expire.db ns5/expire.conf
-rm -f ns8/manual-update-rpz.db
-rm -f */policy2.db
-rm -f */*.jnl
-rm -f proto.* dsset-* trusted.conf dig.out* nsupdate.tmp ns*/*tmp
-rm -f ns5/requests ns5/*.perf
-rm -f */named.memstats */*.run */*.run.prev */named.stats */session.key
-rm -f */*.log */*core */*.pid
-rm -f ns*/named.lock
-rm -f ns*/named.conf
-rm -f ns*/*switch
-rm -f ns*/managed-keys.bind*
-rm -f tmp
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out*",
+ "dnsrps.cache",
+ "dnsrps.conf",
+ "dnsrps.zones",
+ "proto.*",
+ "trusted.conf",
+ "ns2/K*",
+ "ns2/bl.tld2.db",
+ "ns2/tld2s.db",
+ "ns3/bl-2.db",
+ "ns3/bl-cname.db",
+ "ns3/bl-disabled.db",
+ "ns3/bl-drop.db",
+ "ns3/bl-garden.db",
+ "ns3/bl-given.db",
+ "ns3/bl-no-op.db",
+ "ns3/bl-nodata.db",
+ "ns3/bl-nxdomain.db",
+ "ns3/bl-passthru.db",
+ "ns3/bl-tcp-only.db",
+ "ns3/bl-wildcname.db",
+ "ns3/bl.db",
+ "ns3/bl.tld2.db",
+ "ns3/fast-expire.db",
+ "ns3/manual-update-rpz.db",
+ "ns3/mixed-case-rpz.db",
+ "ns3/named.conf.tmp",
+ "ns3/named.stats",
+ "ns5/bl.db",
+ "ns5/empty.db",
+ "ns5/empty.db.jnl",
+ "ns5/example.db",
+ "ns5/expire.conf",
+ "ns5/fast-expire.db",
+ "ns5/named.stats",
+ "ns5/policy2.db",
+ "ns5/policy2.db.jnl",
+ "ns5/rpz-switch",
+ "ns6/bl.tld2s.db",
+ "ns6/empty.db",
+ "ns6/named.stats",
+ "ns7/policy2.db",
+ "ns8/manual-update-rpz.db",
+ ]
+)
+
def test_rpz(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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*/*.jnl
-rm -f ns*/named.conf
-rm -f ns*/named.memstats
-rm -f ns*/named.run
-rm -f ns*/rpz*.txt
-rm -rf __pycache__
-rm -f ns3/*-rpz-external.local.db
import dns.message
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns3/*-rpz-external.local.db",
+ "ns3/rpz*.txt",
+ ]
+)
+
@pytest.mark.parametrize(
"qname,source,rcode",
+++ /dev/null
-#!/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 rpz tests.
-
-rm -f dig.out.*
-
-rm -f ns*/named.memstats
-rm -f ns*/*.run
-rm -f ns*/*core *core
-rm -f ns*/named.conf
-
-rm -f ns2/*.local
-rm -f ns2/*.queries
-rm -f ns2/named.[0-9]*.conf
-rm -f ns2/named.conf.header
-
-rm -f ns3/named.conf
-rm -f ns3/named.run.prev
-
-rm -f ns*/session.key
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "dnsrps.cache",
+ "dnsrps.conf",
+ "ans*/ans.run",
+ "ns2/*.queries",
+ "ns2/*.local",
+ "ns2/named.*.conf",
+ "ns2/named.conf.header",
+ ]
+)
+
def test_rpzrecurse(run_tests_sh):
run_tests_sh()
import os
-import isctest
import pytest
+import isctest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "tempzone",
+ ]
+)
+
@pytest.mark.parametrize(
"option,expected_result",
+++ /dev/null
-#!/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 rrl tests.
-
-rm -f */named.memstats */named.run */named.stats */log-* */session.key
-rm -f dig.out* *mdig.out*
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.conf
-rm -f ns3/bl*.db */*.jnl */*.core */*.pid
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
import isctest.mark
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "*mdig.out*",
+ "dig.out.*",
+ "ns*/log-*",
+ "ns2/named.stats",
+ ]
+)
+
# The rrl is known to be quite unstable. GL #172
@isctest.mark.flaky(max_runs=2)
+++ /dev/null
-#!/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 dig.out.cyclic dig.out.fixed dig.out.random dig.out.nomatch dig.out.none
-rm -f dig.out.0 dig.out.1 dig.out.2 dig.out.3
-rm -f dig.out.cyclic2
-rm -f ns2/root.bk
-rm -f ns?/named.run ns?/named.core
-rm -f */named.memstats
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns2/root.bk",
+ ]
+)
+
def test_rrsetorder(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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* */K* */dsset-*. */*.signed */trusted.conf */tmp*
-rm -f ns*/dsset-example
-rm -f ns*/named.run
-rm -f ns*/named.memstats
-rm -f ns1/root.db
-rm -f ns2/signer.err
-rm -f dig.out.*
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
import isctest
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "options.conf",
+ "ns*/dsset-*",
+ "ns*/K*",
+ "ns*/trusted.conf",
+ "ns*/*.signed",
+ "ns1/root.db",
+ "ns2/signer.err",
+ ]
+)
+
CHECKCONF = os.environ["CHECKCONF"]
+++ /dev/null
-#!/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.
-
-[ -d ns2/nope ] && chmod 755 ns2/nope
-
-rm -f *.pid
-rm -f */named*.run
-rm -f */named.memstats
-rm -f kill*.out
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named*.pid
-rm -f ns2/named.conf ns2/named-alt*.conf
-rm -f rndc.out*
-rm -rf ns2/nope
-rm -rf ns2/tmp.*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "rndc.out.*",
+ "ns2/named-alt*.conf",
+ "ns2/named*.run",
+ "ns2/nope",
+ "ns2/tmp.*",
+ ]
+)
+
def test_runtime(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.conf
-rm -f ns*/root.bk
-rm -f rndc.out.test*
-rm -f */named.run */named.memstats
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named_dump*
-rm -f ns*/named.stats*
-rm -f ns*/named.run.prev
# 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.*",
+ "ans*/ans.run",
+ "ns*/named.stats*",
+ "ns*/named_dump*",
+ "ns*/named.stats*",
+ "ns*/root.bk",
+ ]
+)
+
def test_serve_stale(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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*.key ./*/K*.private ./*/*.signed ./*/*.db ./*/dsset-*
-rm -f ./*/managed.conf ./*/trusted.conf
-rm -f ./*/named.memstats
-rm -f ./*/named.conf
-rm -f ./*/named.run ./*/named.run.prev
-rm -f ./dig.*
-rm -f ./rndc.*
-rm -f ./sfcache.*
-rm -f ./ns*/managed-keys.bind*
-rm -f ./ns5/named.run.part*
-rm -f ./ns5/named_dump*
# 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.*",
+ "sfcache.*",
+ "ns*/*.db",
+ "ns*/*.signed",
+ "ns*/dsset-*",
+ "ns*/K*.key",
+ "ns*/K*.private",
+ "ns*/managed.conf",
+ "ns*/trusted.conf",
+ "ns5/named.run.*",
+ "ns5/named_dump*",
+ ]
+)
+
def test_sfcache(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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*/*.jnl
-rm -f ns*/named.memstats
-rm -f ns*/rpz*.txt
-rm -f */named.conf
-rm -f */named.run
-rm -rf __pycache__
import isctest
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "resolver/named.conf",
+ "resolver/named.run",
+ ]
+)
+
def do_work(named_proc, resolver_ip, instance, kill_method, n_workers, n_queries):
"""Creates a number of A queries to run in parallel
+++ /dev/null
-#!/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 dnskey.sigs other.sigs dsset.out
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "*.signed",
+ "K*",
+ "dnskey.sigs",
+ "dsset-*",
+ "dsset.out",
+ "other.sigs",
+ ]
+)
+
def test_smartsign(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ns*/managed-keys.bind*
+++ /dev/null
-#!/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.run
-rm -f ns1/named.memstats
-rm -f ns*/named.conf
-rm -f ns*/managed-keys.bind*
+++ /dev/null
-#!/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 tmp
-rm -f dig.out.*
-rm -f ns*/named.conf
-rm -f ns3/example.db
-rm -f ns3/undelegated.db
-rm -f ns4/sub.example.db
-rm -f ns?/named.memstats
-rm -f ns?/named.run
-rm -f ns?/named_dump.db
-rm -rf */*.signed
-rm -rf */K*
-rm -rf */dsset-*
-rm -rf */trusted.conf
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "tmp",
+ "ns*/trusted.conf",
+ "ns*/dsset-*",
+ "ns*/K*",
+ "ns*/*.signed",
+ "ns3/example.db",
+ "ns3/undelegated.db",
+ "ns4/sub.example.db",
+ ]
+)
+
def test_staticstub(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ns3/example.bk
-rm -f ns3/internal.bk
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run
-rm -f */ans.run
-rm -f */named.stats
-rm -f */named.stats-stage*
-rm -f dig.out*
-rm -f curl.out.*
-rm -f stats*out
-rm -f ns*/managed-keys.bind*
-rm -f xsltproc.out.*
-rm -f named.stats.* ns*/named.stats.* ns*/named.recursing
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "curl.out.*",
+ "dig.out.*",
+ "named.stats.*",
+ "stats.xml.out",
+ "xsltproc.out.*",
+ "ans*/ans.run",
+ "ns*/statistics-channels.conf",
+ "ns*/named.recursing",
+ ]
+)
+
def test_statistics(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ./Kdnssec*
-rm -f bind9.xsl.1 bind9.xsl.2 bind9.xsl.3
-rm -f compressed.headers regular.headers compressed.out regular.out
-rm -f dig.out*
-rm -f nc.out* curl.out* header.in*
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.conf
-rm -f ns*/named.memstats
-rm -f ns*/named.run*
-rm -f ns*/named.stats
-rm -f ns*/signzone.out.*
-rm -f ns2/*.db.signed* ns2/dsset-*. ns2/*.jbk
-rm -f ns2/Kdnssec* ns2/dnssec.*.id
-rm -f ns2/Kmanykeys* ns2/manykeys.*.id
-rm -f ns2/dnssec.db.signed* ns2/dsset-dnssec.
-rm -f ns3/*.db
-rm -f traffic traffic.out.* traffic.json.* traffic.xml.*
-rm -f xml.*mem json.*mem
-rm -f xml.*stats json.*stats
-rm -f zones zones.out.* zones.json.* zones.xml.* zones.expect.*
-rm -f xfrins xfrins.*
-rm -rf ./__pycache__
pytest.register_assert_rewrite("generic")
import generic
-pytestmark = isctest.mark.have_json_c
requests = pytest.importorskip("requests")
+pytestmark = [
+ isctest.mark.have_json_c,
+ pytest.mark.extra_artifacts(
+ [
+ "ns2/*.jnl",
+ "ns2/*.signed",
+ "ns2/dsset-*",
+ "ns2/K*",
+ "ns2/dnssec.db.signed",
+ "ns2/dnssec.*.id",
+ "ns2/manykeys.*.id",
+ "ns2/signzone.out.*",
+ "ns3/_default.nzd",
+ "ns3/example-tcp.db",
+ "ns3/example-tls.db",
+ "ns3/example.db",
+ ]
+ ),
+]
+
# JSON helper functions
def fetch_zones_json(statsip, statsport):
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "K*",
+ "bind9.xsl.1",
+ "bind9.xsl.2",
+ "compressed.headers",
+ "compressed.out",
+ "curl.*",
+ "dig.out.*",
+ "header.in*",
+ "json.*",
+ "nc.out*",
+ "regular.headers",
+ "regular.out",
+ "xfrins*",
+ "xml.*mem",
+ "xml.*stats",
+ "zones*",
+ "ns2/*.jnl",
+ "ns2/*.signed",
+ "ns2/dsset-*",
+ "ns2/K*",
+ "ns2/dnssec.*.id",
+ "ns2/manykeys.*.id",
+ "ns2/named.stats",
+ "ns2/signzone.out.*",
+ "ns3/_default.nzf*",
+ "ns3/_default.nzd*",
+ "ns3/example-new.db",
+ "ns3/example-tcp.db",
+ "ns3/example-tls.db",
+ "ns3/example.db",
+ ]
+)
+
def test_statschannel(run_tests_sh):
run_tests_sh()
pytest.register_assert_rewrite("generic")
import generic
-pytestmark = isctest.mark.have_libxml2
requests = pytest.importorskip("requests")
+pytestmark = [
+ isctest.mark.have_libxml2,
+ pytest.mark.extra_artifacts(
+ [
+ "ns2/K*",
+ "ns2/*.jnl",
+ "ns2/*.signed",
+ "ns2/dsset-*",
+ "ns2/dnssec.*.id",
+ "ns2/manykeys.*.id",
+ "ns2/signzone.out.*",
+ "ns3/_default.nzd",
+ "ns3/example-tcp.db",
+ "ns3/example-tls.db",
+ "ns3/example.db",
+ ]
+ ),
+]
+
# XML helper functions
def fetch_zones_xml(statsip, statsport):
+++ /dev/null
-#!/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?/zone*.bk
-
-rm -f ns2/zone0*.db
-rm -f ns2/zone0*.jnl
-rm -f */named.memstats
-rm -f ns*/managed-keys.bind*
-rm -f ns*/named.run
-rm -f ns*/named.conf
import os
import time
+import dns.update
+import pytest
+
import isctest
-import dns.update
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns2/zone0*.db",
+ "ns2/zone0*.jnl",
+ ]
+)
def rndc_loop(test_state, server):
+++ /dev/null
-#!/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 stub tests.
-#
-rm -f dig.out.ns[35] ns3/child.example.st
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f ns*/managed-keys.bind*
-rm -f ns5/example.db
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns3/child.example.st",
+ "ns5/example.db",
+ ]
+)
+
def test_stub(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.memstats
-rm -f ./*/named.conf
-rm -f ./*/named.run
-rm -f ./*/named.run.prev
-rm -f ./*/named.stats
-rm -f ./dig.out.*
-rm -f ./ns1/K*+*+*.key
-rm -f ./ns1/K*+*+*.private
-rm -f ./ns1/dsset-*
-rm -f ./ns1/example.db
-rm -f ./ns1/example.db.signed
-rm -f ./ns1/insecure.example.db
-rm -f ./ns1/insecure.example.db.signed
-rm -f ./ns1/dnamed.db
-rm -f ./ns1/dnamed.db.signed
-rm -f ./ns1/minimal.db
-rm -f ./ns1/minimal.db.signed
-rm -f ./ns1/root.db
-rm -f ./ns1/root.db.signed
-rm -f ./ns1/soa-without-dnskey.db
-rm -f ./ns1/soa-without-dnskey.db.signed
-rm -f ./ns1/trusted.conf
-rm -f ./ns2/named_dump.db
-rm -f ./ns*/managed-keys.bind*
-rm -f ./nodata.out ./insecure.nodata.out
-rm -f ./nxdomain.out ./insecure.nxdomain.out
-rm -f ./wild.out ./insecure.wild.out
-rm -f ./wildcname.out ./insecure.wildcname.out
-rm -f ./wildnodata1nsec.out ./insecure.wildnodata1nsec.out
-rm -f ./wildnodata2nsec.out ./insecure.wildnodata2nsec.out
-rm -f ./wildnodata2nsecafterdata.out ./insecure.wildnodata2nsecafterdata.out
-rm -f ./minimal.nxdomain.out
-rm -f ./black.out
-rm -f ./xml.out*
-rm -f ./json.out*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "black.out",
+ "dig.out.*",
+ "insecure.nodata.out",
+ "insecure.nxdomain.out",
+ "insecure.wild.out",
+ "insecure.wildcname.out",
+ "insecure.wildnodata1nsec.out",
+ "insecure.wildnodata2nsec.out",
+ "insecure.wildnodata2nsecafterdata.out",
+ "json.out*",
+ "minimal.nxdomain.out",
+ "nodata.out",
+ "nxdomain.out",
+ "wild.out",
+ "wildcname.out",
+ "wildnodata1nsec.out",
+ "wildnodata2nsec.out",
+ "wildnodata2nsecafterdata.out",
+ "xml.out*",
+ "ns*/named.stats",
+ "ns*/statistics-channels.conf",
+ "ns1/K*+*+*.key",
+ "ns1/K*+*+*.private",
+ "ns1/dnamed.db",
+ "ns1/dnamed.db.signed",
+ "ns1/dsset-*",
+ "ns1/example.db",
+ "ns1/example.db.signed",
+ "ns1/insecure.example.db",
+ "ns1/insecure.example.db.signed",
+ "ns1/minimal.db",
+ "ns1/minimal.db.signed",
+ "ns1/root.db",
+ "ns1/root.db.signed",
+ "ns1/soa-without-dnskey.db",
+ "ns1/soa-without-dnskey.db.signed",
+ "ns1/trusted.conf",
+ ]
+)
+
def test_synthfromdnssec(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ./*/named.stats*
-rm -f ans6/ans.run*
-rm -f dig.out*
-rm -f rndc.out*
-rm -f ns*/managed-keys.bind*
# 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.*",
+ "ans*/ans.run",
+ "ans*/ans.run.prev",
+ "ns*/named.stats.*",
+ ]
+)
+
def test_tcp(run_tests_sh):
run_tests_sh()
import dns.message
import dns.query
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ans*/ans.run",
+ ]
+)
TIMEOUT = 10
+++ /dev/null
-#!/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*/managed-keys.bind*
-rm -f ./ns*/named.conf
-rm -f ./ns*/named.memstats
-rm -f ./ns*/named.run*
-rm -f ./ns*/named.stats
-rm -rf ./__pycache__
-rm -f ./ns*/large.db
import isctest.mark # pylint: disable=import-error
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns1/large.db",
+ ]
+)
TIMEOUT = 10
+++ /dev/null
-#!/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 ./*/example.db
-rm -rf ./headers.*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns1/example.db",
+ ]
+)
+
def test_transport_acl(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ./*/example.db
-rm -rf ./headers.*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns1/example.db",
+ ]
+)
+
def test_transport_change(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 tsig tests.
-#
-
-rm -f dig.out.*
-rm -f */named.memstats
-rm -f */named.conf
-rm -f ns1/named-fips.conf
-rm -f */named.run
-rm -f Kexample.net.*
-rm -f keygen.out?
-rm -f ns*/managed-keys.bind*
-rm -f packet.out
import dns.query
import dns.tsigkeyring
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ans*/ans.run",
+ "ns1/named-fips.conf",
+ ]
+)
+
TIMEOUT = 10
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "keygen.out*",
+ "packet.out",
+ "ans*/ans.run",
+ "ns1/named-fips.conf",
+ ]
+)
+
def test_tsig(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 tsiggss tests.
-#
-
-rm -f ns1/*.jnl ns1/update.txt ns1/auth.sock
-rm -f ns1/*.db ns1/K*.key ns1/K*.private
-rm -f ns1/_default.tsigkeys
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f authsock.pid
-rm -f ns1/core
-rm -f nsupdate.out*
-rm -f ns*/managed-keys.bind*
import dns.rdatatype
import dns.rrset
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns1/K*",
+ "ns1/example.nil.db",
+ ]
+)
+
class CraftedTKEYQuery:
"""
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "authsock.pid",
+ "nsupdate.out*",
+ "ns1/K*",
+ "ns1/_default.tsigkeys",
+ "ns1/auth.sock",
+ "ns1/example.nil.db",
+ "ns1/example.nil.db.jnl",
+ "ns1/update.txt",
+ ]
+)
+
def test_tsiggss(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 ./ns*/managed-keys.bind*
+++ /dev/null
-#!/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* check.out
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f */*.bk
-rm -f */*.bk.*
-rm -f ns3/Kexample.*
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "check.out",
+ "dig.out.*",
+ "ns2/example-in.bk",
+ "ns3/K*",
+ "ns3/example-in.bk",
+ "ns3/example-in.bk.jbk",
+ "ns3/example-in.bk.signed",
+ "ns3/example-in.bk.signed.jnl",
+ ]
+)
+
def test_unknown(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.ns1* dig.out.ns2 dig.out.ns1 dig.out.ns3 dig.out.ns1.after
-rm -f ns1/*.jnl ns2/*.jnl ns3/*.jnl ns1/example.db ns2/*.bk ns3/*.bk
-rm -f ns3/noprimary1.db
-rm -f ns3/dnstap.out*
-rm -f ns3/dnstap.conf
-rm -f dnstap.out*
-rm -f dnstapread.out*
-rm -f */named.memstats
-rm -f */named.run
-rm -f */named.conf
-rm -f */ans.run
-rm -f Ksig0.example2.*
-rm -f keyname keyname.err
-rm -f ns1/example2.db
-rm -f ns1/example2-toomanykeys.db
-rm -f ns*/managed-keys.bind*
-rm -f nsupdate.out.*
-rm -f ns*/named.run.prev
import isctest.mark
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "Ksig0.example2*",
+ "dig.out.*",
+ "dnstap.out.*",
+ "dnstapread.out*",
+ "keyname*",
+ "nsupdate.out.*",
+ "ans*/ans.run",
+ "ns*/*.bk",
+ "ns*/*.jnl",
+ "ns1/example.db",
+ "ns1/example2-toomanykeys.db",
+ "ns1/example2.db",
+ "ns3/dnstap.conf",
+ "ns3/dnstap.out",
+ "ns3/noprimary1.db",
+ ]
+)
+
@pytest.mark.xfail(reason="GL #4996", condition=isctest.mark.with_dnstap())
def test_upforwd(run_tests_sh):
import isctest
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "verify.out.*",
+ "zones/K*",
+ "zones/dsset-*",
+ "zones/*.bad",
+ "zones/*.good",
+ "zones/*.out*",
+ "zones/*.tmp",
+ "zones/updated*",
+ ]
+)
+
VERIFY = os.environ.get("VERIFY")
+++ /dev/null
-#!/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
-
-#
-# Clean up after zone transfer tests.
-#
-
-rm -f ns*/named.conf
-rm -f ns3/example.bk dig.out.ns?.?
-rm -f ns2/example.db ns3/internal.bk
-rm -f -- */*.jnl
-rm -f -- */named.memstats
-rm -f -- */named.run */named.run.prev
-rm -f ns2/external/K*
-rm -f ns2/external/inline.db.jbk
-rm -f ns2/external/inline.db.signed
-rm -f ns2/external/inline.db.signed.jnl
-rm -f ns2/internal/K*
-rm -f ns2/internal/inline.db.jbk
-rm -f ns2/internal/inline.db.signed
-rm -f ns2/internal/inline.db.signed.jnl
-rm -f ns2/zones.conf
-rm -f ns2/db.* ns2/K*
-rm -f dig.out.external dig.out.internal
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out.*",
+ "ns2/K*",
+ "ns2/db.*",
+ "ns2/*.jnl",
+ "ns2/example.db",
+ "ns2/zones.conf",
+ "ns2/external/K*",
+ "ns2/external/inline.db.jbk",
+ "ns2/external/inline.db.signed",
+ "ns2/external/inline.db.signed.jnl",
+ "ns2/internal/K*",
+ "ns2/internal/inline.db.jbk",
+ "ns2/internal/inline.db.signed",
+ "ns2/internal/inline.db.signed.jnl",
+ "ns3/internal.bk",
+ ]
+)
+
def test_views(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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.conf
-rm -f ns1/K*
-rm -f ns1/*.db
-rm -f ns1/*.signed
-rm -f ns1/dsset-*
-rm -f ns1/keyset-*
-rm -f ns1/trusted.conf
-rm -f ns1/private.nsec.conf
-rm -f ns1/private.nsec3.conf
-rm -f ns1/signer.err
-rm -f */named.memstats
-rm -f dig.out.ns*.test*
-rm -f ns*/managed-keys.bind*
# 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-*",
+ "ns1/*.signed",
+ "ns1/allwild.db",
+ "ns1/example.db",
+ "ns1/nestedwild.db",
+ "ns1/nsec.db",
+ "ns1/nsec3.db",
+ "ns1/private.nsec.conf",
+ "ns1/private.nsec.db",
+ "ns1/private.nsec3.conf",
+ "ns1/private.nsec3.db",
+ "ns1/root.db",
+ "ns1/signer.err",
+ "ns1/trusted.conf",
+ ]
+)
+
def test_wildcard(run_tests_sh):
run_tests_sh()
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
-
"""
Example property-based test for wildcard synthesis.
Verifies that otherwise-empty zone with single wildcard record * A 192.0.2.1
import isctest.name
import isctest.query
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns1/K*",
+ "ns1/dsset-*",
+ "ns1/*.signed",
+ "ns1/allwild.db",
+ "ns1/example.db",
+ "ns1/nestedwild.db",
+ "ns1/nsec.db",
+ "ns1/nsec3.db",
+ "ns1/private.nsec.conf",
+ "ns1/private.nsec.db",
+ "ns1/private.nsec3.conf",
+ "ns1/private.nsec3.db",
+ "ns1/root.db",
+ "ns1/signer.err",
+ "ns1/trusted.conf",
+ ]
+)
+
# labels of a zone with * A 192.0.2.1 wildcard
SUFFIX = dns.name.from_text("allwild.test.")
+++ /dev/null
-#!/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 */ans.run
-rm -f */named.conf
-rm -f */named.memstats
-rm -f */named.run
-rm -f */named.run.prev
-rm -f axfr.out
-rm -f dig.out.*
-rm -f ns*/managed-keys.bind*
-rm -f ns1/dot-fallback.db
-rm -f ns1/edns-expire.db
-rm -f ns1/ixfr-too-big.db ns1/ixfr-too-big.db.jnl
-rm -f ns1/sec.db ns2/sec.db
-rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl ns2/dot-fallback.db
-rm -f ns2/mapped.db
-rm -f ns3/example.bk ns3/xfer-stats.bk ns3/tsigzone.bk ns3/example.bk.jnl
-rm -f ns3/mapped.bk
-rm -f ns3/primary.bk ns3/primary.bk.jnl
-rm -f ns4/*.db ns4/*.jnl
-rm -f ns6/*.db ns6/*.bk ns6/*.jnl
-rm -f ns7/*.db ns7/*.bk ns7/*.jnl
-rm -f ns8/large.db ns8/small.db
-rm -f stats.*
-rm -f wait_for_message.*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "axfr.out",
+ "dig.out.*",
+ "stats.*",
+ "wait_for_message.*",
+ "ans*/ans.run",
+ "ns1/dot-fallback.db",
+ "ns1/edns-expire.db",
+ "ns1/ixfr-too-big.db",
+ "ns1/ixfr-too-big.db.jnl",
+ "ns1/ixfr-too-many-diffs.db.jnl",
+ "ns1/sec.db",
+ "ns2/dot-fallback.db",
+ "ns2/example.db",
+ "ns2/example.db.jnl",
+ "ns2/mapped.db",
+ "ns2/sec.db",
+ "ns2/tsigzone.db",
+ "ns3/example.bk",
+ "ns3/example.bk.jnl",
+ "ns3/mapped.bk",
+ "ns3/primary.bk",
+ "ns3/primary.bk.jnl",
+ "ns3/tsigzone.bk",
+ "ns3/xfer-stats.bk",
+ "ns4/nil.db",
+ "ns4/root.db",
+ "ns6/axfr-max-idle-time.bk",
+ "ns6/axfr-max-transfer-time.bk",
+ "ns6/axfr-rndc-retransfer-force.bk",
+ "ns6/edns-expire.bk",
+ "ns6/ixfr-too-big.bk",
+ "ns6/ixfr-too-big.bk.jnl",
+ "ns6/ixfr-too-many-diffs.bk",
+ "ns6/primary.db",
+ "ns6/primary.db.jnl",
+ "ns6/sec.bk",
+ "ns7/edns-expire.bk",
+ "ns7/primary2.db",
+ "ns7/sec.bk",
+ "ns7/sec.bk.jnl",
+ "ns8/large.db",
+ "ns8/small.db",
+ ]
+)
+
def test_xfer(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 quota tests.
-#
-
-rm -f ns1/zone*.example.db ns1/zones.conf
-rm -f ns2/zone*.example.bk ns2/zones.conf
-rm -f dig.out.* ns2/changing.bk
-rm -f ns1/changing.db
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f ns*/managed-keys.bind*
import shutil
import signal
+import dns.message
+import pytest
+
import isctest
-import dns.message
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "ns1/changing.db",
+ "ns1/zone*.example.db",
+ "ns1/zones.conf",
+ "ns2/changing.bk",
+ "ns2/zone*.example.bk",
+ "ns2/zones.conf",
+ ]
+)
def test_xferquota(named_port, servers):
+++ /dev/null
-#!/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.run
-rm -f */named.memstats
-rm -f ns2/example.db
-rm -f ns4/example.bk
-rm -f dig.out*
-rm -f query.list
-rm -f ns*/managed-keys.bind*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "dig.out*",
+ "query.list",
+ "ans*/ans.run",
+ "ns2/example.db",
+ "ns4/example.bk",
+ ]
+)
+
def test_zero(run_tests_sh):
run_tests_sh()
+++ /dev/null
-#!/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 *.out
-rm -f */named.memstats
-rm -f */named.conf
-rm -f */named.run
-rm -f */*.db */*.db.signed */K*.key */K*.private */K*.state */*.jnl */dsset-*
-rm -f */signer.err
-rm -f rndc.out.*
-rm -f ns*/managed-keys.bind* ns*/*.mkeys*
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
+import pytest
+
+pytestmark = pytest.mark.extra_artifacts(
+ [
+ "*.out",
+ "rndc.out.*",
+ "ns1/K*",
+ "ns1/bigserial.db",
+ "ns1/dsset-primary.example.",
+ "ns1/duplicate.db",
+ "ns1/primary.db",
+ "ns1/primary.db.signed",
+ "ns1/reload.db",
+ "ns1/signer.err",
+ "ns1/soa.db",
+ "ns2/sec.db",
+ ]
+)
+
def test_zonechecks(run_tests_sh):
run_tests_sh()
projects / thirdparty / bind9.git / commitdiff
