From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 24 Oct 2024 12:30:51 +0000 (+0200)
Subject: Fix intermittent ksr test failure
X-Git-Tag: v9.21.3~57^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5f32f6990b6f33405e5ca33ffbbc3912f852e3f;p=thirdparty%2Fbind9.git

Fix intermittent ksr test failure

The test_ksr_twotwone may fail if the key id is shorter than 5 digits.
Add a leading space to the expected strings which start with the key
tag to avoid the issue.
---

diff --git a/bin/tests/system/isctest/kasp.py b/bin/tests/system/isctest/kasp.py
index 64029984713..223dc33be16 100644
--- a/bin/tests/system/isctest/kasp.py
+++ b/bin/tests/system/isctest/kasp.py
@@ -348,13 +348,13 @@ def _check_signatures(signatures, covers, fqdn, keys):
 
         if not signing:
             for rrsig in signatures:
-                assert f"{key.tag} {fqdn}" not in rrsig
+                assert f" {key.tag} {fqdn}" not in rrsig
             continue
 
         if zrrsig and key.is_zsk():
             has_rrsig = False
             for rrsig in signatures:
-                if f"{key.tag} {fqdn}" in rrsig:
+                if f" {key.tag} {fqdn}" in rrsig:
                     has_rrsig = True
                     break
             assert has_rrsig
@@ -362,12 +362,12 @@ def _check_signatures(signatures, covers, fqdn, keys):
 
         if zrrsig and not key.is_zsk():
             for rrsig in signatures:
-                assert f"{key.tag} {fqdn}" not in rrsig
+                assert f" {key.tag} {fqdn}" not in rrsig
 
         if krrsig and key.is_ksk():
             has_rrsig = False
             for rrsig in signatures:
-                if f"{key.tag} {fqdn}" in rrsig:
+                if f" {key.tag} {fqdn}" in rrsig:
                     has_rrsig = True
                     break
             assert has_rrsig
@@ -375,7 +375,7 @@ def _check_signatures(signatures, covers, fqdn, keys):
 
         if krrsig and not key.is_ksk():
             for rrsig in signatures:
-                assert f"{key.tag} {fqdn}" not in rrsig
+                assert f" {key.tag} {fqdn}" not in rrsig
 
     return numsigs