mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-23 23:50:03 -06:00
tests: Implemented check for domainlevel before installation verification
We only need to verify installation of replica under domain level 1, otherwise replica is not installed but only a gpg file is prepared Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
parent
43994e6697
commit
b8968d923c
@ -999,10 +999,7 @@ class TestReplicaInstall(CALessBase):
|
||||
result = self.prepare_replica(http_pkcs12='server.p12',
|
||||
dirsrv_pkcs12='server.p12')
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
@pytest.mark.xfail(reason='freeipa ticket 5603')
|
||||
@ -1016,10 +1013,7 @@ class TestReplicaInstall(CALessBase):
|
||||
result = self.prepare_replica(http_pkcs12='http.p12',
|
||||
dirsrv_pkcs12='dirsrv.p12')
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
@pytest.mark.xfail(reason='freeipa ticket 5603')
|
||||
@ -1033,10 +1027,7 @@ class TestReplicaInstall(CALessBase):
|
||||
result = self.prepare_replica(http_pkcs12='http.p12',
|
||||
dirsrv_pkcs12='dirsrv.p12')
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
@replica_install_teardown
|
||||
@ -1049,12 +1040,10 @@ class TestReplicaInstall(CALessBase):
|
||||
result = self.prepare_replica(http_pkcs12='http.p12',
|
||||
dirsrv_pkcs12='dirsrv.p12')
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
|
||||
@replica_install_teardown
|
||||
def test_ds_san(self):
|
||||
"IPA replica install with DS certificate with SAN"
|
||||
@ -1065,10 +1054,7 @@ class TestReplicaInstall(CALessBase):
|
||||
result = self.prepare_replica(http_pkcs12='http.p12',
|
||||
dirsrv_pkcs12='dirsrv.p12')
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
@replica_install_teardown
|
||||
@ -1083,10 +1069,7 @@ class TestReplicaInstall(CALessBase):
|
||||
result = self.prepare_replica(http_pin=None, unattended=False,
|
||||
stdin_text=stdin_text)
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
@replica_install_teardown
|
||||
@ -1101,10 +1084,7 @@ class TestReplicaInstall(CALessBase):
|
||||
result = self.prepare_replica(dirsrv_pin=None, unattended=False,
|
||||
stdin_text=stdin_text)
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
@replica_install_teardown
|
||||
@ -1118,10 +1098,7 @@ class TestReplicaInstall(CALessBase):
|
||||
dirsrv_pkcs12='dirsrv.p12',
|
||||
http_pin='')
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
@replica_install_teardown
|
||||
@ -1135,10 +1112,8 @@ class TestReplicaInstall(CALessBase):
|
||||
dirsrv_pkcs12='dirsrv.p12',
|
||||
dirsrv_pin='')
|
||||
assert result.returncode == 0
|
||||
|
||||
result = self.install_replica()
|
||||
assert result.returncode == 0
|
||||
|
||||
if self.domain_level > DOMAIN_LEVEL_0:
|
||||
self.verify_installation()
|
||||
|
||||
class TestClientInstall(CALessBase):
|
||||
num_clients = 1
|
||||
|
Loading…
Reference in New Issue
Block a user