Merge branch '128-fix-mkeys-system-test-race-v9_12' into 'v9_12'

Fix a race in the mkeys system test

Closes #128

See merge request isc-projects/bind9!103

CHANGES

@@ -1,3 +1,6 @@
+4911.	[test]		Improved the reliability of the 'mkeys' system test.
+			[GL #128]
+
 4910.	[func]		Update util/check-changes to work on release branches.
 			[GL #113]
 
@@ -8,7 +11,7 @@
 			system test. Also changed its name to allow-query.
 			[GL #81]
 
-4907.	[test]		Improved the reliabilty of the 'notify' system
+4907.	[test]		Improved the reliability of the 'notify' system
 			test. [GL #59]
 
 4905.	[bug]		irs_resconf_load() ignored resolv.conf syntax errors

bin/tests/system/mkeys/tests.sh

@@ -739,7 +739,7 @@ rm -f ns5/managed-keys.bind*
 cp ns5/named2.args ns5/named.args
 nextpart ns5/named.run > /dev/null
 $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} . ns5
-wait_for_log "Returned from key fetch in keyfetch_done()" ns5/named.run
+wait_for_log "Returned from key fetch in keyfetch_done() for '.': failure" ns5/named.run
 mkeys_secroots_on 5
 grep '; initializing managed' ns5/named.secroots > /dev/null 2>&1 || ret=1
 # ns1 should still REFUSE queries from ns5, so resolving should be impossible
@@ -750,9 +750,9 @@ grep "status: SERVFAIL" dig.out.ns5.a.test$n > /dev/null || ret=1
 # Allow queries from ns5 to ns1
 copy_setports ns1/named3.conf.in ns1/named.conf
 rm -f ns1/root.db.signed.jnl
-mkeys_reconfig_on 1
 nextpart ns5/named.run > /dev/null
-wait_for_log "Returned from key fetch in keyfetch_done()" ns5/named.run
+mkeys_reconfig_on 1
+wait_for_log "Returned from key fetch in keyfetch_done() for '.': success" ns5/named.run
 mkeys_secroots_on 5
 grep '; managed' ns5/named.secroots > /dev/null 2>&1 || ret=1
 # ns1 should not longer REFUSE queries from ns5, so managed keys should be