From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Wed, 8 Jul 2026 18:30:41 +0000 (+0200)
Subject: tests-extra: improve bind_version() to accept newer extended string
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29acaeaba94de7af39143921abf9d777886d217a;p=thirdparty%2Fknot-dns.git

tests-extra: improve bind_version() to accept newer extended string
---

diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py
index 1105553782..5999486d1e 100644
--- a/tests-extra/tools/dnstest/server.py
+++ b/tests-extra/tools/dnstest/server.py
@@ -1120,7 +1120,13 @@ class Bind(Server):
         self.ctl("sync%s" % zone_name, wait=wait)
 
     def bind_version(self):
-        return tuple(map(int, run([self.daemon_bin, '-v'], stdout=PIPE, stderr=PIPE, text=True).stdout.replace('BIND ', '').split('-')[0].split('.')))
+        version = (
+            run([self.daemon_bin, '-v'], stdout=PIPE, stderr=PIPE, text=True)
+            .stdout.removeprefix('BIND ')
+            .split()[0]          # "9.20.24"
+            .split('-')[0]       # handles "-RedHat" suffixes
+        )
+        return tuple(map(int, version.split('.')))
 
     def key_timer_param(self, timer_name, timer_val):
         ktpmap = { 'publish': '-P', 'active': '-A', 'retire': '-I', 'revoke': '-R', 'remove': '-D' }