From d5ab331d8a41b81fcd0f6d938cd1645d3f305fc9 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Fri, 28 Nov 2025 09:05:21 +0100 Subject: [PATCH] dnskey is now a property of Key class After a rebase, the dnskey() invocations need to be adjusted to accomodate for !11201 (0bf20f8d). (cherry picked from commit a91f13cae81b2381f0f0b7e3c6d6a1c2e58a70e8) --- bin/tests/system/multisigner/tests_multisigner.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/tests/system/multisigner/tests_multisigner.py b/bin/tests/system/multisigner/tests_multisigner.py index 69f644d40d..695f2420b9 100644 --- a/bin/tests/system/multisigner/tests_multisigner.py +++ b/bin/tests/system/multisigner/tests_multisigner.py @@ -164,7 +164,7 @@ def check_add_zsk(server, zone, keys, expected, extra_keys, extra, primary=None) update_msg = dns.update.UpdateMessage(zone) for zsk in extra_keys: - dnskey = zsk.dnskey().split() + dnskey = str(zsk.dnskey).split() rdata = " ".join(dnskey[4:]) update_msg.add(f"{zone}.", TTL, "DNSKEY", rdata) primary.nsupdate(update_msg) @@ -205,7 +205,7 @@ def _check_remove_zsk_fail( ) zsks = [k for k in keys if not k.is_ksk()] - dnskey = zsks[0].dnskey().split() + dnskey = str(zsks[0].dnskey).split() rdata = " ".join(dnskey[4:]) update_msg = dns.update.UpdateMessage(zone) update_msg.delete(f"{zone}.", "DNSKEY", rdata) @@ -251,7 +251,7 @@ def check_remove_zsk( update_msg = dns.update.UpdateMessage(zone) for zsk in extra_keys: - dnskey = zsk.dnskey().split() + dnskey = str(zsk.dnskey).split() rdata = " ".join(dnskey[4:]) update_msg.delete(f"{zone}.", "DNSKEY", rdata) primary.nsupdate(update_msg) @@ -287,7 +287,7 @@ def check_add_cdnskey(server, zone, keys, expected, extra_keys, extra, primary=N # Update the server with the CDNSKEY record from the other providers. update_msg = dns.update.UpdateMessage(zone) for ksk in extra_keys: - dnskey = ksk.dnskey().split() + dnskey = str(ksk.dnskey).split() rdata = " ".join(dnskey[4:]) update_msg.add(f"{zone}.", TTL, "CDNSKEY", rdata) primary.nsupdate(update_msg) @@ -321,7 +321,7 @@ def _check_remove_cdnskey_fail( ) ksks = [k for k in keys if not k.is_ksk()] - dnskey = ksks[0].dnskey().split() + dnskey = str(ksks[0].dnskey).split() rdata = " ".join(dnskey[4:]) update_msg = dns.update.UpdateMessage(zone) update_msg.delete(f"{zone}.", "CDNSKEY", rdata) @@ -367,7 +367,7 @@ def check_remove_cdnskey( update_msg = dns.update.UpdateMessage(zone) for ksk in extra_keys: - dnskey = ksk.dnskey().split() + dnskey = str(ksk.dnskey).split() rdata = " ".join(dnskey[4:]) update_msg.delete(f"{zone}.", "CDNSKEY", rdata) primary.nsupdate(update_msg)