From 29012bb374b1edae43d0a81b9c5fae6651f75882 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Fri, 18 Nov 2022 13:23:01 +0100 Subject: [PATCH] ipatests: remove xfail for tests using sssctl domain-status The tests calling sssctl domain-status were marked xfail because of SSSD issue #6331. Now that the issue is fixed and freeipa bumped sssd required version, remove the xfail annotation. Related: https://pagure.io/freeipa/issue/9234 Signed-off-by: Florence Blanc-Renaud Reviewed-By: Alexander Bokovoy --- ipatests/test_integration/test_adtrust_install.py | 11 ----------- ipatests/test_integration/test_commands.py | 4 ---- 2 files changed, 15 deletions(-) diff --git a/ipatests/test_integration/test_adtrust_install.py b/ipatests/test_integration/test_adtrust_install.py index 3f500af41..f23221186 100644 --- a/ipatests/test_integration/test_adtrust_install.py +++ b/ipatests/test_integration/test_adtrust_install.py @@ -6,10 +6,8 @@ import re import os -import pytest import textwrap -from ipaplatform.osinfo import osinfo from ipaplatform.paths import paths from ipapython.dn import DN from ipatests.pytest_ipa.integration import tasks @@ -52,9 +50,6 @@ class TestIpaAdTrustInstall(IntegrationTest): res = self.master.run_command(['testparm', '-s']) assert 'ERROR' not in (res.stdout_text + res.stderr_text) - @pytest.mark.xfail( - osinfo.id == 'fedora' and osinfo.version_number >= (37,), - reason='freeipa ticket 9234', strict=True) def test_add_agent_not_allowed(self): """Check that add-agents can be run only by Admins.""" user = "nonadmin" @@ -256,9 +251,6 @@ class TestIpaAdTrustInstall(IntegrationTest): '"member","ipaexternalmember")') assert value in entry_list - @pytest.mark.xfail( - osinfo.id == 'fedora' and osinfo.version_number >= (37,), - reason='freeipa ticket 9234', strict=True) def test_ipa_user_pac(self): """Test that a user can request a service ticket with PAC""" user = 'testpacuser' @@ -287,9 +279,6 @@ class TestIpaAdTrustInstall(IntegrationTest): tasks.kinit_admin(self.master) self.master.run_command(['ipa', 'user-del', user]) - @pytest.mark.xfail( - osinfo.id == 'fedora' and osinfo.version_number >= (37,), - reason='freeipa ticket 9234', strict=True) def test_ipa_user_s4u2self_pac(self): """Test that a service can request S4U2Self ticket with PAC""" user = 'tests4u2selfuser' diff --git a/ipatests/test_integration/test_commands.py b/ipatests/test_integration/test_commands.py index 7c2cc32a9..bc87038b4 100644 --- a/ipatests/test_integration/test_commands.py +++ b/ipatests/test_integration/test_commands.py @@ -24,7 +24,6 @@ from datetime import datetime, timedelta from ipalib.constants import IPAAPI_USER -from ipaplatform.osinfo import osinfo from ipaplatform.paths import paths from ipapython.dn import DN @@ -1607,9 +1606,6 @@ class TestIPACommandWithoutReplica(IntegrationTest): tasks.ldapsearch_dm(self.master, base, ldap_args=[], scope='sub') tasks.ldapsearch_dm(self.master, base, ldap_args=[], scope='base') - @pytest.mark.xfail( - osinfo.id == 'fedora' and osinfo.version_number >= (37,), - reason='freeipa ticket 9234', strict=True) def test_sid_generation(self): """ Test SID generation