From 056d73dd080fb6ec7e2f2a484631cc9634f8e1a1 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Wed, 31 Dec 2025 11:40:42 +0100 Subject: [PATCH] Wait for "sending notifies" for step3.zsk-prepub Commit c17ac426082b2eca802dd1b2e1bb9b4b4b291199 changed some tests to wait for "zone_needdump" messages instead of "sending notifies", because notifies are rate limited and "zone_needdump" happen on every change. However, inspecting the logs, the "zone_needdump" changes happen more than once (likely because the re-signing is done in batches): received control channel command 'sign step3.zsk-prepub.manual' zone_journal: zone step3.zsk-prepub.manual/IN (signed): enter zone_needdump: zone step3.zsk-prepub.manual/IN (signed): enter zone_journal: zone step3.zsk-prepub.manual/IN (signed): enter zone_needdump: zone step3.zsk-prepub.manual/IN (signed): enter zone_journal: zone step3.zsk-prepub.manual/IN (signed): enter zone_needdump: zone step3.zsk-prepub.manual/IN (signed): enter zone step3.zsk-prepub.manual/IN (signed): sending notifies This means we are running the rollover step checks too fast in some test runs. Revert the wait for log change for the rollover-zsk-prepub test. (cherry picked from commit 22c02a4df9fefeb9626807e47da3892143aebfc0) --- .../rollover-zsk-prepub/tests_rollover_zsk_prepublication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7d3be511b3..31e0b99e43 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 @@ -254,7 +254,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}") - watcher.wait_for_line(f"zone_needdump: zone {zone}/IN (signed): enter") + watcher.wait_for_line(f"zone {zone}/IN (signed): sending notifies") step["smooth"] = False step["nextev"] = Iret(CONFIG, smooth=False)