Don't fail the system tests when shutdown test is missing pytest

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 10e38dc279ba82a3716fb45bd7e584d1026cb41d..02b6877c929f88480ce07817c7d03434f203911a 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -134,7 +134,6 @@ TESTS +=                    \
        rrsetorder              \
        rsabigexponent          \
        runtime                 \
-       shutdown                \
        sfcache                 \
        smartsign               \
        sortlist                \
@@ -210,6 +209,10 @@ 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
@@ -218,10 +221,6 @@ if HAVE_PKCS11
 TESTS += pkcs11
 endif
 
-if HAVE_PYTEST
-TESTS += rpzextra
-endif
-
 else !HAVE_PERL
 check:
        echo Perl is not available, no tests were ran

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index 91c277e4523a55710540a6257fa79f25b00fe0d0..b2fafd453c8d78f96053772696d8835e621bf3e9 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -114,7 +114,6 @@ rrsetorder
 rsabigexponent
 runtime
 sfcache
-shutdown
 smartsign
 sortlist
 spf

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 160b8148fc827d70afb5b8302b78d69158ced2cf..9e3ab3248c03f79f1bcba8be37d5e79f27dd0a65 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -89,6 +89,7 @@ logfileconfig
 nzd2nzf
 pipelined
 qmin
+shutdown
 tcp"
 PARALLELDIRS="$PARALLEL_COMMON $PARALLEL_UNIX"