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 uninstallation test, use different method to stop dirsrv

Browse Source 
The API may not be initialized so using ds.is_running() may fail.
Call systemctl directly to ensure the dirsrv instance is stopped.

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Reviewed-By: Michal Reznik <mreznik@redhat.com>
This commit is contained in:
Rob Crittenden 2018-08-21 13:20:01 -04:00 committed by Florence Blanc-Renaud
parent e3820682c7
commit 2064c72bfb
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ipatests/test_integration/test_uninstallation.py
View File

@ -17,8 +17,8 @@ import os
from ipatests.test_integration.base import IntegrationTest
from ipatests.pytest_ipa.integration import tasks
from ipaplatform.paths import paths
from ipaserver.install.installutils import realm_to_serverid
from ipaserver.install import dsinstance
from ipaserver.install.installutils import realm_to_serverid
class TestUninstallBase(IntegrationTest):
@ -88,10 +88,9 @@ class TestUninstallBase(IntegrationTest):
# be marked as uninstalled so server cert will still be
# tracked and the instances may remain. This can cause
# subsequent installations to fail so be thorough.
ds = dsinstance.DsInstance()
ds_running = ds.is_running()
if ds_running:
ds.stop(serverid)
dashed_domain = self.master.domain.realm.replace(".", '-')
dirsrv_service = "dirsrv@%s.service" % dashed_domain
self.master.run_command(['systemctl', 'stop', dirsrv_service])
# Moving it back should allow the uninstall to finish
# successfully.
@ -101,17 +100,21 @@ class TestUninstallBase(IntegrationTest):
'%s/%s' % (paths.ETC_DIRSRV, instance_name)
])
# DS has been marked as uninstalled so force the issue
ds.stop_tracking_certificates(serverid)
self.master.run_command([
paths.REMOVE_DS_PL,
'-i', instance_name
])
cmd = self.master.run_command([
'ipa-server-install',
'--uninstall', '-U'],
raiseonerr=False
)
assert cmd.returncode == 0
self.master.run_command([
paths.IPA_GETCERT,
'stop-tracking',
'-d', '%s/%s' % (paths.ETC_DIRSRV, instance_name),
'-n', 'Server-Cert',
])
self.master.run_command([
paths.REMOVE_DS_PL,
'-i', instance_name
])