From ad85cc8eae8544680bd083d76d7bf8997856d4a7 Mon Sep 17 00:00:00 2001 From: Pavel Picka Date: Tue, 24 Jul 2018 09:09:29 +0200 Subject: [PATCH] PRCI failures fix test_installation.py - ticket 7008 closed so removing xfail - TestInstallWithCA1 - TestInstallWithCA - TestInstallWithCA_DNS1 - TestInstallWithCA_DNS2 nightly_master - test_backup_and_restore_TestUser[r>R]ootFilesOwnership[Permission] Signed-off-by: Pavel Picka Reviewed-By: Michal Reznik --- ipatests/prci_definitions/nightly_master.yaml | 4 ++-- ipatests/test_integration/test_installation.py | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ipatests/prci_definitions/nightly_master.yaml b/ipatests/prci_definitions/nightly_master.yaml index c299e4138..0332c6eca 100644 --- a/ipatests/prci_definitions/nightly_master.yaml +++ b/ipatests/prci_definitions/nightly_master.yaml @@ -280,14 +280,14 @@ jobs: timeout: 5400 topology: *master_1repl - fedora-28/test_backup_and_restore_TestUserrootFilesOwnership: + fedora-28/test_backup_and_restore_TestUserRootFilesOwnershipPermission: requires: [fedora-28/build] priority: 50 job: class: RunPytest args: build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_backup_and_restore.py::TestUserrootFilesOwnership + test_suite: test_integration/test_backup_and_restore.py::TestUserRootFilesOwnershipPermission template: *ci-master-f28 timeout: 7200 topology: *master_1repl diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py index b7a9628c8..a3be80aa4 100644 --- a/ipatests/test_integration/test_installation.py +++ b/ipatests/test_integration/test_installation.py @@ -164,13 +164,11 @@ class TestInstallWithCA1(InstallTestBase1): def test_replica1_ipa_kra_install(self): 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, reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica2_with_ca_kra_install(self): 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, reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica2_ipa_dns_install(self): @@ -183,7 +181,6 @@ class TestInstallWithCA2(InstallTestBase2): def install(cls, mh): 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, reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica0_with_ca_kra_dns_install(self): @@ -229,13 +226,11 @@ class TestInstallWithCA_DNS1(InstallTestBase1): def test_replica1_ipa_kra_install(self): 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, reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica2_with_ca_kra_install(self): 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, reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica2_ipa_dns_install(self): @@ -248,7 +243,6 @@ class TestInstallWithCA_DNS2(InstallTestBase2): def install(cls, mh): 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, reason='does not work on DOMAIN_LEVEL_0 by design') def test_replica0_with_ca_kra_dns_install(self):