From: Michał Kępień <michal@isc.org>
Date: Mon, 14 Mar 2022 07:59:32 +0000 (+0100)
Subject: Tweak Automake conditionals for pytest-based tests
X-Git-Tag: v9.19.0~67^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=173ad9cf467f06493393148e855c6208bc99e654;p=thirdparty%2Fbind9.git

Tweak Automake conditionals for pytest-based tests

Since pytest itself skips tests using dnspython if the latter is not
available, also using Automake conditionals for silently skipping
pytest-based tests requiring dnspython is redundant and hides
information.  Allow all pytest-based tests requiring dnspython to be run
whenever pytest itself is available, in order to ensure test skipping is
done in a uniform manner.

Note that the above reasoning only applies to pytest-based tests, so
similar adjustments were not made for shell-based tests using Python
scripts that require dnspython ("chain", "cookie", "dnssec", "qmin").
---

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index c21ce5436fc..215b42a114f 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -214,20 +214,18 @@ endif HAVE_PERLMOD_NET_DNS
 if HAVE_PYTHON
 TESTS += kasp keymgr2kasp tcp pipelined
 
-if HAVE_PYMOD_DNS
-TESTS += checkds dispatch qmin cookie timeouts
+if HAVE_PYTEST
+TESTS += checkds dispatch rpzextra shutdown timeouts
+endif
 
+if HAVE_PYMOD_DNS
+TESTS += qmin cookie
 if HAVE_PERLMOD_NET_DNS
 TESTS += dnssec
 if HAVE_PERLMOD_NET_DNS_NAMESERVER
 TESTS += chain
 endif HAVE_PERLMOD_NET_DNS_NAMESERVER
 endif HAVE_PERLMOD_NET_DNS
-
-if HAVE_PYTEST
-TESTS += rpzextra shutdown
-endif
-
 endif HAVE_PYMOD_DNS
 
 endif HAVE_PYTHON