diff options
| author | Oleg Fayans <ofayans@redhat.com> | 2016-01-29 13:47:20 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-01-29 14:15:29 +0100 |
| commit | b23fea76608a7d820062d1e30f06b99adeaab0ee (patch) | |
| tree | 3ffbee8e71092c8b01536d2500ad92746846b073 /ipatests/test_integration | |
| parent | c5076452d6332284d11bae932ebac1464fe2578a (diff) | |
| download | freeipa-b23fea76608a7d820062d1e30f06b99adeaab0ee.tar.gz freeipa-b23fea76608a7d820062d1e30f06b99adeaab0ee.tar.xz freeipa-b23fea76608a7d820062d1e30f06b99adeaab0ee.zip | |
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>
Diffstat (limited to 'ipatests/test_integration')
| -rw-r--r-- | ipatests/test_integration/tasks.py | 2 | ||||
| -rw-r--r-- | ipatests/test_integration/test_forced_client_reenrollment.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index a1d6cb88a..27d2449ec 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -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) diff --git a/ipatests/test_integration/test_forced_client_reenrollment.py b/ipatests/test_integration/test_forced_client_reenrollment.py index df0e90526..d430a98e7 100644 --- a/ipatests/test_integration/test_forced_client_reenrollment.py +++ b/ipatests/test_integration/test_forced_client_reenrollment.py @@ -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(): |