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

This commit is contained in:
Daniel Salzman 2026-07-08 20:30:41 +02:00
parent e7bac59dd9
commit 29acaeaba9

View 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' }