upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-26 03:12:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chg: test: Wait for log zone_needdump is more reliable

Browse source 
Closes #5648

Merge branch '5648-need-dump-instead-of-sending-notifies' into 'main'

See merge request isc-projects/bind9!11265
This commit is contained in:
Matthijs Mekking 2025-12-01 13:17:59 +00:00
commit edcbcdd081
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/tests/system/dnssec/tests_policy.py
View file

@ -63,7 +63,9 @@ def test_signatures_validity(ns3, templates):
templates.render("ns3/named.conf", {"long_sigs": True})
with ns3.watch_log_from_here() as watcher:
ns3.reconfigure(log=False)
watcher.wait_for_line("siginterval.example/IN (signed): sending notifies")
watcher.wait_for_line(
"zone_needdump: zone siginterval.example/IN (signed): enter"
)
res = isctest.query.tcp(msg, "10.53.0.3")
after = next(filter(is_rrsig_soa, res.answer))

12
bin/tests/system/nsec3/tests_nsec3_reconfig.py
View file

@ -326,9 +326,13 @@ def test_nsec3_ent(ns3, templates):
# remove a name, bump the SOA, and reload
templates.render(f"{ns3.identifier}/nsec3-ent.kasp.db", {"serial": 2})
messages = [
f"zone {zone}/IN (unsigned): loaded serial 2",
f"zone_needdump: zone {zone}/IN (signed): enter",
]
with ns3.watch_log_from_here() as watcher:
ns3.rndc(f"reload {zone}")
watcher.wait_for_line(f"zone {zone}/IN (signed): sending notifies")
watcher.wait_for_sequence(messages)
# try the query again
query = isctest.query.create(f"c.{fqdn}", dns.rdatatype.A)
@ -345,9 +349,13 @@ def test_nsec3_ent(ns3, templates):
# add a name with an ENT, bump the SOA, and reload ensuring the time stamp changes
templates.render(f"{ns3.identifier}/nsec3-ent.kasp.db", {"serial": 3})
messages = [
f"zone {zone}/IN (unsigned): loaded serial 3",
f"zone_needdump: zone {zone}/IN (signed): enter",
]
with ns3.watch_log_from_here() as watcher:
ns3.rndc(f"reload {zone}")
watcher.wait_for_line(f"zone {zone}/IN (signed): sending notifies")
watcher.wait_for_sequence(messages)
# try the query again
query = isctest.query.create(f"x.y.z.{fqdn}", dns.rdatatype.A)

2
bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py
View file

@ -225,7 +225,7 @@ def test_zsk_prepub_step3(tld, alg, size, ns3):
# Force full resign and check all signatures have been replaced.
with ns3.watch_log_from_here() as watcher:
ns3.rndc(f"sign {zone}", log=False)
watcher.wait_for_line(f"zone {zone}/IN (signed): sending notifies")
watcher.wait_for_line(f"zone_needdump: zone {zone}/IN (signed): enter")
step["smooth"] = False
step["nextev"] = Iret(CONFIG, smooth=False)