IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix replica_promotion-domlevel0 test failures

Browse Source 
Integration test is failing due to wrong message being
displayed by ipa. This issue was most probably introduced
by PR:
f51869bf52
Error messages for domain level 0 and >=1 cases were basically
swapped. This PR is swapping them back.

Reviewed-By: Tibor Dudlak <tdudlak@redhat.com>
This commit is contained in:
Alexander Koksharov
2018-02-05 12:49:40 +01:00
committed by Christian Heimes
parent 1ad27076a5
commit 156f912104
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ipaserver/install/server/replicainstall.py
View File

@@ -789,8 +789,12 @@ def install_check(installer):
check_domain_level_is_supported(domain_level)
if domain_level != constants.DOMAIN_LEVEL_0:
raise RuntimeError(
"You must provide a file generated by ipa-replica-prepare to "
"create a replica when the domain is at level 0."
"You used the wrong mechanism to install a replica in "
"domain level {dl}:\n"
"\tFor domain level >= 1 replica installation, first join the "
"domain by running ipa-client-install, then run "
"ipa-replica-install without a replica file."
.format(dl=domain_level)
)
# Check pre-existing host entry
@@ -1133,12 +1137,8 @@ def promote_check(installer):
check_domain_level_is_supported(domain_level)
if domain_level < constants.DOMAIN_LEVEL_1:
raise RuntimeError(
"You used the wrong mechanism to install a replica in "
"domain level {dl}:\n"
"\tFor domain level >= 1 replica installation, first join the "
"domain by running ipa-client-install, then run "
"ipa-replica-install without a replica file."
.format(dl=domain_level)
"You must provide a file generated by ipa-replica-prepare to "
"create a replica when the domain is at level 0."
)
# Check authorization