From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 2 Jul 2020 09:12:31 +0000 (+0200)
Subject: Don't fail the system tests when shutdown test is missing pytest
X-Git-Tag: v9.17.3~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8b5958d28457a778e2af45b953edcda24f81202;p=thirdparty%2Fbind9.git

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 10e38dc279b..02b6877c929 100644
--- 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 91c277e4523..b2fafd453c8 100644
--- 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 160b8148fc8..9e3ab3248c0 100644
--- 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"