]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
tests-extra: improve bind_version() to accept newer extended string
authorDaniel Salzman <daniel.salzman@nic.cz>
Wed, 8 Jul 2026 18:30:41 +0000 (20:30 +0200)
committerDaniel Salzman <daniel.salzman@nic.cz>
Wed, 8 Jul 2026 18:30:51 +0000 (20:30 +0200)
tests-extra/tools/dnstest/server.py

index 11055537829c1fd3246f7e0594b3217f17227eb6..5999486d1ea03d91ccfe0f38745697ad2d2fbb08 100644 (file)
@@ -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' }