From b1ffc80f26cd22af2002e524d2f10c2a7d40f0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Thu, 27 Nov 2025 14:13:32 +0100 Subject: [PATCH] Remove obsolete dnspython prerequisite checks dnspython has been mandatory to run system test for quite a while. Remove all extraneous checks for this module from prereq.sh scipts. --- bin/tests/system/chain/prereq.sh | 5 ----- bin/tests/system/cookie/prereq.sh | 21 --------------------- bin/tests/system/digdelv/prereq.sh | 5 ----- bin/tests/system/dnssec/prereq.sh | 5 ----- bin/tests/system/forward/prereq.sh | 5 ----- bin/tests/system/qmin/prereq.sh | 21 --------------------- 6 files changed, 62 deletions(-) delete mode 100644 bin/tests/system/cookie/prereq.sh delete mode 100644 bin/tests/system/qmin/prereq.sh diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh index fe84055246..0d6e2b45d4 100644 --- a/bin/tests/system/chain/prereq.sh +++ b/bin/tests/system/chain/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/cookie/prereq.sh b/bin/tests/system/cookie/prereq.sh deleted file mode 100644 index b6b005f8ff..0000000000 --- a/bin/tests/system/cookie/prereq.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, you can obtain one at https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -. ../conf.sh - -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - -exit 0 diff --git a/bin/tests/system/digdelv/prereq.sh b/bin/tests/system/digdelv/prereq.sh index 32889aa251..c52be9c97a 100644 --- a/bin/tests/system/digdelv/prereq.sh +++ b/bin/tests/system/digdelv/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh index 32889aa251..c52be9c97a 100644 --- a/bin/tests/system/dnssec/prereq.sh +++ b/bin/tests/system/dnssec/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/forward/prereq.sh b/bin/tests/system/forward/prereq.sh index 32889aa251..c52be9c97a 100644 --- a/bin/tests/system/forward/prereq.sh +++ b/bin/tests/system/forward/prereq.sh @@ -13,11 +13,6 @@ . ../conf.sh -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - if ! ${PERL} -MNet::DNS -e ''; then echo_i "perl Net::DNS module is required" exit 1 diff --git a/bin/tests/system/qmin/prereq.sh b/bin/tests/system/qmin/prereq.sh deleted file mode 100644 index b6b005f8ff..0000000000 --- a/bin/tests/system/qmin/prereq.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, you can obtain one at https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -. ../conf.sh - -if ! ${PYTHON} -c 'import dns'; then - echo_i "python dns module is required" - exit 1 -fi - -exit 0