From 4f04e91be265bc7dc1984049867b6e0a5fa63d57 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Thu, 4 Oct 2018 11:57:38 +0200 Subject: [PATCH] ipatests: remove TestReplicaManageDel (dl0) TestReplicaManageDel is a test using domain level 0 but we do not support it any more. Remove the test. Related to https://pagure.io/freeipa/issue/7689 Reviewed-By: Alexander Bokovoy --- ipatests/prci_definitions/nightly_master.yaml | 12 --- ipatests/test_integration/test_topology.py | 73 ------------------- 2 files changed, 85 deletions(-) diff --git a/ipatests/prci_definitions/nightly_master.yaml b/ipatests/prci_definitions/nightly_master.yaml index 8270adf37..fbee8d10d 100644 --- a/ipatests/prci_definitions/nightly_master.yaml +++ b/ipatests/prci_definitions/nightly_master.yaml @@ -508,18 +508,6 @@ jobs: timeout: 7200 topology: *master_3repl_1client - fedora-28/test_topology_TestReplicaManageDel: - requires: [fedora-28/build] - priority: 50 - job: - class: RunPytest - args: - build_url: '{fedora-28/build_url}' - test_suite: test_integration/test_topology.py::TestReplicaManageDel - template: *ci-master-f28 - timeout: 7200 - topology: *master_3repl_1client - fedora-28/test_replication_layouts_TestLineTopologyWithoutCA: requires: [fedora-28/build] priority: 50 diff --git a/ipatests/test_integration/test_topology.py b/ipatests/test_integration/test_topology.py index 6cd24ba2c..02690a983 100644 --- a/ipatests/test_integration/test_topology.py +++ b/ipatests/test_integration/test_topology.py @@ -247,76 +247,3 @@ class TestCASpecificRUVs(IntegrationTest): master.config.dirman_password]).stdout_text assert(replica.hostname not in res2), ( "Replica RUVs were not clean during replica uninstallation") - - -@pytest.mark.xfail(reason="Ticket N 7622", strict=True) -class TestReplicaManageDel(IntegrationTest): - domain_level = 0 - topology = 'star' - num_replicas = 3 - - def test_replica_managed_del_domlevel0(self): - """ - http://www.freeipa.org/page/V4/Manage_replication_topology_4_4/ - Test_Plan#Test_case:_ipa-replica-manage_del_with_turned_off_replica - _under_domain_level_0_keeps_ca-related_RUVs - """ - master = self.master - replica = self.replicas[0] - replica.run_command(['ipactl', 'stop']) - master.run_command(['ipa-replica-manage', 'del', '-f', '-p', - master.config.dirman_password, replica.hostname]) - result = master.run_command(['ipa-replica-manage', 'list-ruv', - '-p', master.config.dirman_password]) - num_ruvs = result.stdout_text.count(replica.hostname) - assert(num_ruvs == 1), ("Expected to find 1 replica's RUV, found %s" % - num_ruvs) - ruvid_re = re.compile(r".*%s:389: (\d+).*" % replica.hostname) - replica_ruvs = ruvid_re.findall(result.stdout_text) - master.run_command(['ipa-replica-manage', 'clean-ruv', '-f', - '-p', master.config.dirman_password, - replica_ruvs[0]]) - result2 = master.run_command(['ipa-replica-manage', 'list-ruv', - '-p', master.config.dirman_password]) - assert(replica.hostname not in result2.stdout_text), ( - "Replica's RUV was not properly removed") - - def test_clean_dangling_ruv_multi_ca(self): - """ - http://www.freeipa.org/page/V4/Manage_replication_topology_4_4/ - Test_Plan#Test_case:_ipa-replica-manage_clean-dangling-ruv_in_a - _multi-CA_setup - """ - master = self.master - replica = self.replicas[1] - replica.run_command(['ipa-server-install', '--uninstall', '-U']) - master.run_command(['ipa-replica-manage', 'del', '-f', '-p', - master.config.dirman_password, replica.hostname]) - result1 = master.run_command(['ipa-replica-manage', 'list-ruv', '-p', - master.config.dirman_password]) - ruvid_re = re.compile(r".*%s:389: (\d+).*" % replica.hostname) - assert(ruvid_re.search(result1.stdout_text)), ( - "Replica's RUV should not be removed under domain level 0") - master.run_command(['ipa-replica-manage', 'clean-dangling-ruv', '-p', - master.config.dirman_password], stdin_text="yes\n") - result2 = master.run_command(['ipa-replica-manage', 'list-ruv', '-p', - master.config.dirman_password]) - assert(replica.hostname not in result2.stdout_text), ( - "Replica's RUV was not removed by a clean-dangling-ruv command") - - def test_replica_managed_del_domlevel1(self): - """ - http://www.freeipa.org/page/V4/Manage_replication_topology_4_4/ - Test_Plan#Test_case:_ipa-replica-manage_del_with_turned_off_replica - _under_domain_level_1_removes_ca-related_RUVs - """ - master = self.master - replica = self.replicas[2] - master.run_command(['ipa', 'domainlevel-set', '1']) - replica.run_command(['ipactl', 'stop']) - master.run_command(['ipa-replica-manage', 'del', '-f', '-p', - master.config.dirman_password, replica.hostname]) - result = master.run_command(['ipa-replica-manage', 'list-ruv', - '-p', master.config.dirman_password]) - assert(replica.hostname not in result.stdout_text), ( - "Replica's RUV was not properly removed")