From 7f92aa4f0c90cda3140ab2b262ec31ea02874f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Va=C5=A1ek?= <david.vasek@nic.cz>
Date: Sat, 29 May 2021 00:37:09 +0200
Subject: [PATCH] fixup -- optional
---
tests-extra/tests/ixfr/many_zones/test.py | 4 ----
tests-extra/tools/dnstest/server.py | 3 ++-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/tests-extra/tests/ixfr/many_zones/test.py b/tests-extra/tests/ixfr/many_zones/test.py
index c7da24d99f..aa3d6ed158 100644
--- a/tests-extra/tests/ixfr/many_zones/test.py
+++ b/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)
diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py
index 7356846bbb..2c1d84528b 100644
--- a/tests-extra/tools/dnstest/server.py
+++ b/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)
--
GitLab