mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-25 08:21:05 -06:00
Enabled recreation of test directory in apply_common_fixes function
Without it any test comprized of more than one cycle of installing-uninstalling of ipa would fail due to the fact that test folder on the remote machine gets deleted during ipa uninstallation. Also removed duplicate call of apply_common fixes and added unapply_fixes to uninstall_replica Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
parent
c5076452d6
commit
b23fea7660
@ -94,6 +94,7 @@ def apply_common_fixes(host, fix_resolv=True):
|
||||
modify_nm_resolv_conf_settings(host)
|
||||
if fix_resolv:
|
||||
fix_resolv_conf(host)
|
||||
prepare_host(host)
|
||||
|
||||
|
||||
def backup_file(host, filename):
|
||||
@ -348,7 +349,6 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
|
||||
'--forwarder', replica.config.dns_forwarder
|
||||
])
|
||||
if domainlevel(master) == DOMAIN_LEVEL_0:
|
||||
apply_common_fixes(replica)
|
||||
# prepare the replica file on master and put it to replica, AKA "old way"
|
||||
replica_prepare(master, replica)
|
||||
replica_filename = get_replica_filename(replica)
|
||||
|
@ -279,7 +279,6 @@ class TestForcedClientReenrollment(IntegrationTest):
|
||||
|
||||
@pytest.fixture()
|
||||
def client(request):
|
||||
tasks.prepare_host(request.cls.clients[0])
|
||||
tasks.install_client(request.cls.master, request.cls.clients[0])
|
||||
|
||||
def teardown_client():
|
||||
|
Loading…
Reference in New Issue
Block a user