From 29acaeaba94de7af39143921abf9d777886d217a Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Wed, 8 Jul 2026 20:30:41 +0200 Subject: [PATCH] tests-extra: improve bind_version() to accept newer extended string --- tests-extra/tools/dnstest/server.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py index 110555378..5999486d1 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' }