IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: Implemented check for domainlevel before installation verification

Browse Source 
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:
Oleg Fayans 2016-09-21 14:31:40 +02:00 committed by David Kupka
parent 43994e6697
commit b8968d923c
1 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ipatests/test_integration/test_caless.py
View File

@ -999,11 +999,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='server.p12', result = self.prepare_replica(http_pkcs12='server.p12',
dirsrv_pkcs12='server.p12') dirsrv_pkcs12='server.p12')
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
self.verify_installation()
@pytest.mark.xfail(reason='freeipa ticket 5603') @pytest.mark.xfail(reason='freeipa ticket 5603')
@replica_install_teardown @replica_install_teardown
@ -1016,11 +1013,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
self.verify_installation()
@pytest.mark.xfail(reason='freeipa ticket 5603') @pytest.mark.xfail(reason='freeipa ticket 5603')
@replica_install_teardown @replica_install_teardown
@ -1033,11 +1027,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
self.verify_installation()
@replica_install_teardown @replica_install_teardown
def test_http_san(self): def test_http_san(self):
@ -1049,11 +1040,9 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
self.verify_installation()
result = self.install_replica()
assert result.returncode == 0
self.verify_installation()
@replica_install_teardown @replica_install_teardown
def test_ds_san(self): def test_ds_san(self):
@ -1065,11 +1054,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pkcs12='http.p12', result = self.prepare_replica(http_pkcs12='http.p12',
dirsrv_pkcs12='dirsrv.p12') dirsrv_pkcs12='dirsrv.p12')
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
self.verify_installation()
@replica_install_teardown @replica_install_teardown
def test_interactive_missing_http_pkcs_password(self): def test_interactive_missing_http_pkcs_password(self):
@ -1083,11 +1069,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(http_pin=None, unattended=False, result = self.prepare_replica(http_pin=None, unattended=False,
stdin_text=stdin_text) stdin_text=stdin_text)
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
self.verify_installation()
@replica_install_teardown @replica_install_teardown
def test_interactive_missing_ds_pkcs_password(self): def test_interactive_missing_ds_pkcs_password(self):
@ -1101,11 +1084,8 @@ class TestReplicaInstall(CALessBase):
result = self.prepare_replica(dirsrv_pin=None, unattended=False, result = self.prepare_replica(dirsrv_pin=None, unattended=False,
stdin_text=stdin_text) stdin_text=stdin_text)
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
self.verify_installation()
@replica_install_teardown @replica_install_teardown
def test_no_http_password(self): def test_no_http_password(self):
@ -1118,11 +1098,8 @@ class TestReplicaInstall(CALessBase):
dirsrv_pkcs12='dirsrv.p12', dirsrv_pkcs12='dirsrv.p12',
http_pin='') http_pin='')
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
self.verify_installation()
@replica_install_teardown @replica_install_teardown
def test_no_ds_password(self): def test_no_ds_password(self):
@ -1135,10 +1112,8 @@ class TestReplicaInstall(CALessBase):
dirsrv_pkcs12='dirsrv.p12', dirsrv_pkcs12='dirsrv.p12',
dirsrv_pin='') dirsrv_pin='')
assert result.returncode == 0 assert result.returncode == 0
if self.domain_level > DOMAIN_LEVEL_0:
result = self.install_replica() self.verify_installation()
assert result.returncode == 0
class TestClientInstall(CALessBase): class TestClientInstall(CALessBase):
num_clients = 1 num_clients = 1