From 98f0077360884da6df31b351caaed7510dec94de Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 1 Dec 2016 14:52:39 +0100 Subject: Remove import of ipaplatform.paths from test_ipalib ipalib's env bootstrapping uses hard-coded defaults, too. https://fedorahosted.org/freeipa/ticket/6474 Signed-off-by: Christian Heimes Reviewed-By: Stanislav Laznicka --- ipatests/test_ipalib/test_config.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ipatests') diff --git a/ipatests/test_ipalib/test_config.py b/ipatests/test_ipalib/test_config.py index 22373e150..1df9a3992 100644 --- a/ipatests/test_ipalib/test_config.py +++ b/ipatests/test_ipalib/test_config.py @@ -30,7 +30,6 @@ from ipatests.util import TempDir, TempHome from ipalib.constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR from ipalib.constants import NAME_REGEX, NAME_ERROR from ipalib import config, constants, base -from ipaplatform.paths import paths import pytest @@ -450,8 +449,8 @@ class test_Env(ClassChecker): assert o.dot_ipa == home.join('.ipa') assert o.in_tree is False assert o.context == 'default' - assert o.confdir == paths.ETC_IPA - assert o.conf == paths.IPA_DEFAULT_CONF + assert o.confdir == '/etc/ipa' + assert o.conf == '/etc/ipa/default.conf' assert o.conf_default == o.conf # Test overriding values created by _bootstrap() @@ -463,11 +462,11 @@ class test_Env(ClassChecker): assert o.in_tree is False assert o.context == 'default' 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') assert o.in_tree is False 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' # Test various overrides and types conversion -- cgit