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

Replace imports from ipaserver

Browse Source 
The ipatests/test_integration/ package only uses ipaserver in a few
places. Copy some simple constants to decouple the packages.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes
2019-05-15 13:38:50 +02:00
parent 289f9c7e25
commit 4b7e81fbbe
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipatests/test_integration/test_uninstallation.py
View File

@@ -17,9 +17,11 @@ import os
from ipatests.test_integration.base import IntegrationTest
from ipatests.pytest_ipa.integration import tasks
from ipaplatform.paths import paths
from ipaserver.install import dsinstance
from ipapython.ipaldap import realm_to_serverid
# from ipaserver.install.dsinstance
DS_INSTANCE_PREFIX = 'slapd-'
class TestUninstallBase(IntegrationTest):
@@ -65,7 +67,7 @@ class TestUninstallBase(IntegrationTest):
self.master.run_command(['ipactl', 'stop'])
serverid = realm_to_serverid(self.master.domain.realm)
instance_name = ''.join([dsinstance.DS_INSTANCE_PREFIX, serverid])
instance_name = ''.join([DS_INSTANCE_PREFIX, serverid])
try:
# Moving the DS instance out of the way will cause the