From: Matthijs Mekking <matthijs@isc.org>
Date: Fri, 25 Jul 2025 09:05:41 +0000 (+0200)
Subject: Improve key collision detection in ksr system test
X-Git-Tag: v9.21.11~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abdb9a133483f3a1968646289ae355e3cdddbf72;p=thirdparty%2Fbind9.git

Improve key collision detection in ksr system test

MR !10238 added key collision detection in the ksr system test but it
was flawed because for every "collide" in the output we also log
"Generating an new key" and for each "Generating" we add the counter
by one, nullifying the subtract by one.

Use regular expressions to search in the output and make the string
expression more strict.
---

diff --git a/bin/tests/system/ksr/tests_ksr.py b/bin/tests/system/ksr/tests_ksr.py
index 0555f626e1c..23faab0eae1 100644
--- a/bin/tests/system/ksr/tests_ksr.py
+++ b/bin/tests/system/ksr/tests_ksr.py
@@ -11,6 +11,7 @@
 
 from datetime import timedelta
 import os
+import re
 import shutil
 import time
 
@@ -651,17 +652,10 @@ def test_ksr_common(ns1):
     overlapping_zsks = isctest.kasp.keystr_to_keylist(out, zskdir)
     assert len(overlapping_zsks) == 4
 
-    verbose = err.split()
-    selected = 0
-    generated = 0
-    for output in verbose:
-        if "Selecting" in output:
-            selected += 1
-        if "Generating" in output:
-            generated += 1
-        # Subtract if there was a key collision.
-        if "collide" in output:
-            generated -= 1
+    selected = len(re.findall("Selecting key pair", err))
+    generated = len(re.findall("Generating key pair", err)) - len(
+        re.findall("collide", err)
+    )
 
     assert selected == 2
     assert generated == 2