diff --git a/bin/tests/system/dnssec/tests_policy.py b/bin/tests/system/dnssec/tests_policy.py index 672dc8a4a4..e813bea448 100644 --- a/bin/tests/system/dnssec/tests_policy.py +++ b/bin/tests/system/dnssec/tests_policy.py @@ -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)) diff --git a/bin/tests/system/nsec3/tests_nsec3_reconfig.py b/bin/tests/system/nsec3/tests_nsec3_reconfig.py index 47cd77ecf2..3b791eba11 100644 --- a/bin/tests/system/nsec3/tests_nsec3_reconfig.py +++ b/bin/tests/system/nsec3/tests_nsec3_reconfig.py @@ -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) diff --git a/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py b/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py index 30a5104c8b..73f249b258 100644 --- a/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py +++ b/bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py @@ -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)