fixup -- optional

tests-extra/tests/ixfr/many_zones/test.py

@@ -24,10 +24,6 @@ for zone in zones:
 
 master.reload()
 
-# Provide some more time for master to get ready.
-if master.valgrind:
-    t.sleep(15)
-
 # Wait for IXFR to slave.
 master.zones_wait(zones, serials_init)
 slave.zones_wait(zones, serials_init)

tests-extra/tools/dnstest/server.py

@@ -669,7 +669,8 @@ class Server(object):
 
         check_log("ZONE WAIT %s: %s" % (self.name, zone.name))
 
-        for t in range(60):
+        attempts = 60 if not self.valgrind else 68
+        for t in range(attempts):
             try:
                 resp = self.dig(zone.name, "SOA", udp=udp, tries=1,
                                 timeout=2, log_no_sep=True, tsig=tsig)