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 c21ce5436fc1616684e67820fc86c1795d75bdee..215b42a114fb27bcc3f3d2e02907e34dbd8f451c 100644 (file)
--- 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