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

CI: allow customized DS install test to work with domain levels

Browse Source 
Test will use tasks methods instead of custom commands to be able work
with domain levels.

https://fedorahosted.org/freeipa/ticket/5606

Reviewed-By: Milan Kubik <mkubik@redhat.com>
This commit is contained in:
Martin Basti
2016-02-24 17:45:55 +01:00
parent 61e627b4b3
commit a63ce1fe22
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ipatests/test_integration/tasks.py
View File

@@ -224,7 +224,7 @@ def enable_replication_debugging(host):
stdin_text=logging_ldif)
def install_master(host, setup_dns=True, setup_kra=False):
def install_master(host, setup_dns=True, setup_kra=False, extra_args=()):
host.collect_log(paths.IPASERVER_INSTALL_LOG)
host.collect_log(paths.IPACLIENT_INSTALL_LOG)
inst = host.domain.realm.replace('.', '-')
@@ -250,6 +250,8 @@ def install_master(host, setup_dns=True, setup_kra=False):
'--auto-reverse'
])
args.extend(extra_args)
host.run_command(args)
enable_replication_debugging(host)
setup_sssd_debugging(host)
@@ -307,7 +309,7 @@ def replica_prepare(master, replica):
def install_replica(master, replica, setup_ca=True, setup_dns=False,
setup_kra=False):
setup_kra=False, extra_args=()):
replica.collect_log(paths.IPAREPLICA_INSTALL_LOG)
replica.collect_log(paths.IPAREPLICA_CONNCHECK_LOG)
allow_sync_ptr(master)
@@ -325,6 +327,9 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
])
if master_authoritative_for_client_domain(master, replica):
args.extend(['--ip-address', replica.ip])
args.extend(extra_args)
if domainlevel(master) == DOMAIN_LEVEL_0:
# prepare the replica file on master and put it to replica, AKA "old way"
replica_prepare(master, replica)