From 56f84ae0a6576ddb843dd504e9226d25ba22b37e Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Feb 07 2019 16:32:21 +0000 Subject: Remove tests which install KRA on replica w/o KRA on master The KRA installation code explicity quits if trying to install a KRA during a replica installation if there is not already a KRA in the topology. A KRA can be added afterward. https://pagure.io/freeipa/issue/7651 Reviewed-By: Christian Heimes Reviewed-By: Florence Blanc-Renaud --- diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py index d6dc009..3af7d77 100644 --- a/ipatests/test_integration/test_installation.py +++ b/ipatests/test_integration/test_installation.py @@ -107,10 +107,6 @@ class InstallTestBase2(IntegrationTest): def install(cls, mh): tasks.install_master(cls.master, setup_dns=False) - def test_replica0_with_ca_kra_dns_install(self): - tasks.install_replica(self.master, self.replicas[0], setup_ca=True, - setup_kra=True, setup_dns=True) - def test_replica1_with_ca_dns_install(self): tasks.install_replica(self.master, self.replicas[1], setup_ca=True, setup_dns=True) @@ -213,12 +209,6 @@ class TestInstallWithCA2(InstallTestBase2): @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, reason='does not work on DOMAIN_LEVEL_0 by design') - @pytest.mark.xfail(reason='Ticket 7651', strict=True) - def test_replica0_with_ca_kra_dns_install(self): - super(TestInstallWithCA2, self).test_replica0_with_ca_kra_dns_install() - - @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, - reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica1_ipa_kra_install(self): super(TestInstallWithCA2, self).test_replica1_ipa_kra_install() @@ -275,14 +265,6 @@ class TestInstallWithCA_DNS2(InstallTestBase2): @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, reason='does not work on DOMAIN_LEVEL_0 by design') - @pytest.mark.xfail(reason='Ticket 7651', strict=True) - def test_replica0_with_ca_kra_dns_install(self): - super( - TestInstallWithCA_DNS2, self - ).test_replica0_with_ca_kra_dns_install() - - @pytest.mark.skipif(config.domain_level == DOMAIN_LEVEL_0, - reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica1_ipa_kra_install(self): super(TestInstallWithCA_DNS2, self).test_replica1_ipa_kra_install()