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

Remove import of ipaplatform.paths from test_ipalib

Browse Source 
ipalib's env bootstrapping uses hard-coded defaults, too.

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

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Christian Heimes 2016-12-01 14:52:39 +01:00 committed by Petr Vobornik
parent 3e3b5462b2
commit 98f0077360
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipatests/test_ipalib/test_config.py
View File

@ -30,7 +30,6 @@ from ipatests.util import TempDir, TempHome
from ipalib.constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR from ipalib.constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
from ipalib.constants import NAME_REGEX, NAME_ERROR from ipalib.constants import NAME_REGEX, NAME_ERROR
from ipalib import config, constants, base from ipalib import config, constants, base
from ipaplatform.paths import paths
import pytest import pytest
@ -450,8 +449,8 @@ class test_Env(ClassChecker):
assert o.dot_ipa == home.join('.ipa') assert o.dot_ipa == home.join('.ipa')
assert o.in_tree is False assert o.in_tree is False
assert o.context == 'default' assert o.context == 'default'
assert o.confdir == paths.ETC_IPA assert o.confdir == '/etc/ipa'
assert o.conf == paths.IPA_DEFAULT_CONF assert o.conf == '/etc/ipa/default.conf'
assert o.conf_default == o.conf assert o.conf_default == o.conf
# Test overriding values created by _bootstrap() # Test overriding values created by _bootstrap()
@ -463,11 +462,11 @@ class test_Env(ClassChecker):
assert o.in_tree is False assert o.in_tree is False
assert o.context == 'default' assert o.context == 'default'
assert o.conf == '/my/wacky/whatever.conf' assert o.conf == '/my/wacky/whatever.conf'
assert o.conf_default == paths.IPA_DEFAULT_CONF assert o.conf_default == '/etc/ipa/default.conf'
(o, home) = self.bootstrap(conf_default='/my/wacky/default.conf') (o, home) = self.bootstrap(conf_default='/my/wacky/default.conf')
assert o.in_tree is False assert o.in_tree is False
assert o.context == 'default' assert o.context == 'default'
assert o.conf == paths.IPA_DEFAULT_CONF assert o.conf == '/etc/ipa/default.conf'
assert o.conf_default == '/my/wacky/default.conf' assert o.conf_default == '/my/wacky/default.conf'
# Test various overrides and types conversion # Test various overrides and types conversion