diff options
| author | Christian Heimes <cheimes@redhat.com> | 2016-12-01 14:52:39 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2016-12-02 09:02:07 +0100 |
| commit | 98f0077360884da6df31b351caaed7510dec94de (patch) | |
| tree | 02690dfbbb87d248d55347703a65e686127b4808 /ipatests | |
| parent | 3e3b5462b28f2133fd4170645cad762c0a0fbb4f (diff) | |
| download | freeipa-98f0077360884da6df31b351caaed7510dec94de.tar.gz freeipa-98f0077360884da6df31b351caaed7510dec94de.tar.xz freeipa-98f0077360884da6df31b351caaed7510dec94de.zip | |
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 <cheimes@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipatests')
| -rw-r--r-- | ipatests/test_ipalib/test_config.py | 9 |
1 files changed, 4 insertions, 5 deletions
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 |