Commit 5d3940e00a for bind
commit 5d3940e00a7d74507e22c33762e137d902ded8f1
Author: Mark Andrews <marka@isc.org>
Date: Thu Oct 22 17:39:13 2026 +1100
Use newer=True from updated templates.render
These tests rewrite a zone file and reload it, possibly within the same
second the previous version was loaded. In nsec3_reconfig, this replaces
the one-second sleeps.
diff --git a/bin/tests/system/nsec3/tests_nsec3_reconfig.py b/bin/tests/system/nsec3/tests_nsec3_reconfig.py
index 2a6dd89681..27d7736339 100644
--- a/bin/tests/system/nsec3/tests_nsec3_reconfig.py
+++ b/bin/tests/system/nsec3/tests_nsec3_reconfig.py
@@ -10,7 +10,6 @@
# information regarding copyright ownership.
import os
-import time
import dns.name
import dns.rcode
@@ -340,8 +339,7 @@ def test_nsec3_ent(ns3, templates):
assert match in str(rrset[0])
# remove a name, bump the SOA, and reload
- time.sleep(1)
- templates.render(f"{ns3.identifier}/nsec3-ent.kasp.db", {"serial": 2})
+ templates.render(f"{ns3.identifier}/nsec3-ent.kasp.db", {"serial": 2}, newer=True)
messages = [
f"zone {zone}/IN (unsigned): loaded serial 2",
@@ -364,8 +362,7 @@ def test_nsec3_ent(ns3, templates):
assert response.rcode() == dns.rcode.NXDOMAIN
# add a name with an ENT, bump the SOA, and reload ensuring the time stamp changes
- time.sleep(1)
- templates.render(f"{ns3.identifier}/nsec3-ent.kasp.db", {"serial": 3})
+ templates.render(f"{ns3.identifier}/nsec3-ent.kasp.db", {"serial": 3}, newer=True)
messages = [
f"zone {zone}/IN (unsigned): loaded serial 3",
diff --git a/bin/tests/system/xfer_servers_list/tests_xfer_servers_list.py b/bin/tests/system/xfer_servers_list/tests_xfer_servers_list.py
index 547101c92e..9e91bfa62d 100644
--- a/bin/tests/system/xfer_servers_list/tests_xfer_servers_list.py
+++ b/bin/tests/system/xfer_servers_list/tests_xfer_servers_list.py
@@ -61,7 +61,7 @@ def test_xfer_servers_list(named_port, ns1, ns2, ns3, ns4, templates):
wait_for_sending_notify(ns1, ns, key_name)
# Then, ns1 update test. It notifies ns2, ns3 and ns4 about it
- templates.render("ns1/test.db", {"serial": 2})
+ templates.render("ns1/test.db", {"serial": 2}, newer=True)
with ns2.watch_log_from_here() as ns2_watcher, ns3.watch_log_from_here() as ns3_watcher, ns4.watch_log_from_here() as ns4_watcher:
ns1.rndc("reload")
ns2_watcher.wait_for_line(