ipatests: fix TestTrust::test_subordinate_suffix

The test test_subordinate_suffix is failing when configuring the DNS
for the trust, because the dnsforwardzone already exists. It was
configured during the previous test for nonposix trust.

At the end of the tests for nonposix trust, unconfigure the DNS
and the trust before calling the subordinate_suffix test, and add
a test cleaning up subordinate_suffix test.

Fixes: https://pagure.io/freeipa/issue/8601
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Florence Blanc-Renaud 2020-11-28 08:45:01 +01:00 committed by Alexander Bokovoy
parent ba9b9502e4
commit 97aa70cd7a

View File

@ -245,6 +245,11 @@ class TestTrust(BaseTestTrust):
self.master.run_command(['kinit', '-C', '-E', self.upn_principal],
stdin_text=self.upn_password)
def test_remove_nonposix_trust(self):
self.remove_trust(self.ad)
tasks.unconfigure_dns_for_trust(self.master, self.ad)
# Test with AD trust defining subordinate suffixes
def test_subordinate_suffix(self):
"""Test subordinate UPN Suffixes"""
tasks.configure_dns_for_trust(self.master, self.ad)
@ -290,7 +295,7 @@ class TestTrust(BaseTestTrust):
)
tasks.kdestroy_all(self.master)
def test_remove_nonposix_trust(self):
def test_remove_subordinate_suffixes_trust(self):
self.remove_trust(self.ad)
tasks.unconfigure_dns_for_trust(self.master, self.ad)