From: Matthijs Mekking <matthijs@isc.org>
Date: Sun, 12 Oct 2025 09:54:54 +0000 (+0200)
Subject: Clean up shell script remnants
X-Git-Tag: v9.21.16~12^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97b38a1fbc86a78ea672b907f0e369203a9a71fc;p=thirdparty%2Fbind9.git

Clean up shell script remnants

All the cases in this system test have been converted to pytest, so
we can clean up the shell script remnants.
---

diff --git a/bin/tests/system/multisigner/tests.sh b/bin/tests/system/multisigner/tests.sh
deleted file mode 100644
index ee06afa7d4c..00000000000
--- a/bin/tests/system/multisigner/tests.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-set -e
-
-# shellcheck source=conf.sh
-. ../conf.sh
-# shellcheck source=kasp.sh
-. ../kasp.sh
-
-dig_with_opts() {
-  $DIG +tcp +noadd +nosea +nostat +nocmd +dnssec -p $PORT "$@"
-}
-
-start_time="$(TZ=UTC date +%s)"
-status=0
-n=0
-
-# Test to make sure no DNSSEC records end up in the raw journal.
-no_dnssec_in_journal() {
-  n=$((n + 1))
-  ret=0
-  echo_i "check zone ${ZONE} raw journal has no DNSSEC ($n)"
-  $JOURNALPRINT "${DIR}/${ZONE}.db.jnl" >"${DIR}/${ZONE}.journal.out.test$n"
-  rrset_exists NSEC "${DIR}/${ZONE}.journal.out.test$n" && ret=1
-  rrset_exists NSEC3 "${DIR}/${ZONE}.journal.out.test$n" && ret=1
-  rrset_exists NSEC3PARAM "${DIR}/${ZONE}.journal.out.test$n" && ret=1
-  rrset_exists RRSIG "${DIR}/${ZONE}.journal.out.test$n" && ret= 1
-  test "$ret" -eq 0 || echo_i "failed"
-  status=$((status + ret))
-}
-
-# Check if a certain RRtype is present in the journal file.
-rrset_exists() (
-  rrtype=$1
-  file=$2
-  lines=$(awk -v rt="${rrtype}" '$5 == rt {print}' ${file} | wc -l)
-  test "$lines" -gt 0
-)
-
-# Check that the CDNSKEY from both providers are published.
-records_published() {
-  _rrtype=$1
-  _expect=$2
-
-  dig_with_opts "$ZONE" "@${SERVER}" "${_rrtype}" >"dig.out.$DIR.test$n" || return 1
-  lines=$(awk -v rt="${_rrtype}" '$4 == rt {print}' dig.out.$DIR.test$n | wc -l)
-  test "$lines" -eq "$_expect" || return 1
-}
-
-echo_i "exit status: $status"
-[ $status -eq 0 ] || exit 1
diff --git a/bin/tests/system/multisigner/tests_sh_multisigner.py b/bin/tests/system/multisigner/tests_sh_multisigner.py
deleted file mode 100644
index 62698238721..00000000000
--- a/bin/tests/system/multisigner/tests_sh_multisigner.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.
-
-import pytest
-
-pytestmark = pytest.mark.extra_artifacts(
-    [
-        "*.created",
-        "cdnskey.ns*",
-        "cds.ns*",
-        "created.*",
-        "dig.out.*",
-        "rndc.dnssec.status.out.*",
-        "secondary.cdnskey.ns*",
-        "secondary.cds.ns*",
-        "unused.*",
-        "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()