IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-07-29 15:55:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix XPASS in test_installation

Browse Source 
Several test cases in test_installation pass, but are marked as xfail().
Only mark the actual failing tests as failed.

See: https://pagure.io/freeipa/issue/7613
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Petr Cech <pcech@redhat.com>
This commit is contained in:
Christian Heimes
2018-07-11 10:50:33 +02:00
parent 0c1010d6f7
commit ec65590c9f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipatests/test_integration/test_installation.py
+7 -4
View File
@@ -152,7 +152,6 @@ class ADTrustInstallTestBase(IntegrationTest):
# Master X Replicas installation tests # Master X Replicas installation tests
## ##
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
class TestInstallWithCA1(InstallTestBase1): class TestInstallWithCA1(InstallTestBase1):
@classmethod @classmethod
@@ -164,24 +163,26 @@ class TestInstallWithCA1(InstallTestBase1):
def test_replica1_ipa_kra_install(self): def test_replica1_ipa_kra_install(self):
super(TestInstallWithCA1, self).test_replica1_ipa_kra_install() super(TestInstallWithCA1, self).test_replica1_ipa_kra_install()
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0,
reason='does not work on DOMAIN_LEVEL_0 by design') reason='does not work on DOMAIN_LEVEL_0 by design')
def test_replica2_with_ca_kra_install(self): def test_replica2_with_ca_kra_install(self):
super(TestInstallWithCA1, self).test_replica2_with_ca_kra_install() super(TestInstallWithCA1, self).test_replica2_with_ca_kra_install()
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0,
reason='does not work on DOMAIN_LEVEL_0 by design') reason='does not work on DOMAIN_LEVEL_0 by design')
def test_replica2_ipa_dns_install(self): def test_replica2_ipa_dns_install(self):
super(TestInstallWithCA1, self).test_replica2_ipa_dns_install() super(TestInstallWithCA1, self).test_replica2_ipa_dns_install()
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
class TestInstallWithCA2(InstallTestBase2): class TestInstallWithCA2(InstallTestBase2):
@classmethod @classmethod
def install(cls, mh): def install(cls, mh):
tasks.install_master(cls.master, setup_dns=False) tasks.install_master(cls.master, setup_dns=False)
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0,
reason='does not work on DOMAIN_LEVEL_0 by design') reason='does not work on DOMAIN_LEVEL_0 by design')
def test_replica0_with_ca_kra_dns_install(self): def test_replica0_with_ca_kra_dns_install(self):
@@ -215,7 +216,7 @@ class TestInstallWithCA_KRA2(InstallTestBase2):
tasks.install_master(cls.master, setup_dns=False, setup_kra=True) tasks.install_master(cls.master, setup_dns=False, setup_kra=True)
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
class TestInstallWithCA_DNS1(InstallTestBase1): class TestInstallWithCA_DNS1(InstallTestBase1):
@classmethod @classmethod
@@ -227,24 +228,26 @@ class TestInstallWithCA_DNS1(InstallTestBase1):
def test_replica1_ipa_kra_install(self): def test_replica1_ipa_kra_install(self):
super(TestInstallWithCA_DNS1, self).test_replica1_ipa_kra_install() super(TestInstallWithCA_DNS1, self).test_replica1_ipa_kra_install()
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0,
reason='does not work on DOMAIN_LEVEL_0 by design') reason='does not work on DOMAIN_LEVEL_0 by design')
def test_replica2_with_ca_kra_install(self): def test_replica2_with_ca_kra_install(self):
super(TestInstallWithCA_DNS1, self).test_replica2_with_ca_kra_install() super(TestInstallWithCA_DNS1, self).test_replica2_with_ca_kra_install()
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0,
reason='does not work on DOMAIN_LEVEL_0 by design') reason='does not work on DOMAIN_LEVEL_0 by design')
def test_replica2_ipa_dns_install(self): def test_replica2_ipa_dns_install(self):
super(TestInstallWithCA_DNS1, self).test_replica2_ipa_dns_install() super(TestInstallWithCA_DNS1, self).test_replica2_ipa_dns_install()
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
class TestInstallWithCA_DNS2(InstallTestBase2): class TestInstallWithCA_DNS2(InstallTestBase2):
@classmethod @classmethod
def install(cls, mh): def install(cls, mh):
tasks.install_master(cls.master, setup_dns=True) tasks.install_master(cls.master, setup_dns=True)
@pytest.mark.xfail(reason="FreeIPA ticket 7008", strict=True)
@pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0,
reason='does not work on DOMAIN_LEVEL_0 by design') reason='does not work on DOMAIN_LEVEL_0 by design')
def test_replica0_with_ca_kra_dns_install(self): def test_replica0_with_ca_kra_dns_install(self):