From ee07c1542a2aa490ca083f7d925ab28d8902acf6 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 12 May 2022 17:54:11 +0300 Subject: [PATCH] Ignore dnssec-enable-related named-checkonf errors in test Check and skip dnssec-enable-related issues in 9.18+ where dnssec-enable option was removed completely. Fixes: https://pagure.io/freeipa/issue/9157 Signed-off-by: Alexander Bokovoy Reviewed-By: Francisco Trivino --- ipatests/test_integration/test_upgrade.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ipatests/test_integration/test_upgrade.py b/ipatests/test_integration/test_upgrade.py index ffc36ce30..24784182d 100644 --- a/ipatests/test_integration/test_upgrade.py +++ b/ipatests/test_integration/test_upgrade.py @@ -10,6 +10,7 @@ import configparser import os import io import textwrap +from subprocess import CalledProcessError from cryptography.hazmat.primitives import serialization import pytest @@ -240,8 +241,15 @@ class TestUpgrade(IntegrationTest): old_contents = named_test_template(self.master) self.master.put_file_contents(paths.NAMED_CONF, old_contents) clear_sysupgrade(self.master, "dns", "named.conf") - # check - self.master.run_command(["named-checkconf", paths.NAMED_CONF]) + # check and skip dnssec-enable-related issues in 9.18+ + # where dnssec-enable option was removed completely + try: + self.master.run_command( + ["named-checkconf", paths.NAMED_CONF] + ) + except CalledProcessError as e: + if not('dnssec-enable' in e.output): + raise e # upgrade self.master.run_command(['ipa-server-upgrade'])