From: Evan Hunt <each@isc.org>
Date: Thu, 16 Jul 2020 22:47:58 +0000 (-0700)
Subject: add more logging to the shutdown system test
X-Git-Tag: v9.17.6~64^2~3
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cc7ceace7dcaade77e7197e9ca2cd916edb7e51a;p=thirdparty%2Fbind9.git

add more logging to the shutdown system test

the test server running in shutdown/resolver was not logging
any debug info, which made it difficult to diagnose test failures.
---

diff --git a/bin/tests/system/shutdown/clean.sh b/bin/tests/system/shutdown/clean.sh
index f977c772e80..0bb926ec773 100644
--- a/bin/tests/system/shutdown/clean.sh
+++ b/bin/tests/system/shutdown/clean.sh
@@ -8,11 +8,10 @@
 # information regarding copyright ownership.
 
 rm -f ns*/*.jnl
-rm -f ns*/named.conf
 rm -f ns*/named.lock
 rm -f ns*/named.memstats
-rm -f ns*/named.run
 rm -f ns*/rpz*.txt
-rm -f resolver/named.conf
+rm -f */named.conf
+rm -f */named.run
 rm -rf __pycache__
 rm -f *.status
diff --git a/bin/tests/system/shutdown/resolver/named.conf.in b/bin/tests/system/shutdown/resolver/named.conf.in
index 8ad14f408bc..d03539003c8 100644
--- a/bin/tests/system/shutdown/resolver/named.conf.in
+++ b/bin/tests/system/shutdown/resolver/named.conf.in
@@ -1,3 +1,11 @@
+logging {
+	channel basic {
+		file "named.run";
+		severity debug 999;
+		print-time yes;
+	};
+	category default { basic; };
+};
 key rndc_key {
     secret "1234abcd8765";
 	algorithm hmac-sha256;