ipaplatform: Move all filesystem paths to ipaplatform.paths module

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

Reviewed-By: Petr Viktorin <pviktori@redhat.com>

3 files changed, 12 insertions, 9 deletions

diff --git a/ipatests/test_ipalib/test_config.py b/ipatests/test_ipalib/test_config.py
index e04dd9530..b4d71e558 100644
--- a/ipatests/test_ipalib/test_config.py
+++ b/ipatests/test_ipalib/test_config.py
@@ -32,6 +32,7 @@ from ipatests.util import TempDir, TempHome
 from ipalib.constants import TYPE_ERROR, 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
 
 
 # Valid environment variables in (key, raw, value) tuples:
@@ -448,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 == '/etc/ipa'
-        assert o.conf == '/etc/ipa/default.conf'
+        assert o.confdir == paths.ETC_IPA
+        assert o.conf == paths.IPA_DEFAULT_CONF
         assert o.conf_default == o.conf
 
         # Test overriding values created by _bootstrap()
@@ -461,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 == '/etc/ipa/default.conf'
+        assert o.conf_default == paths.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 == '/etc/ipa/default.conf'
+        assert o.conf == paths.IPA_DEFAULT_CONF
         assert o.conf_default == '/my/wacky/default.conf'
 
         # Test various overrides and types conversion
diff --git a/ipatests/test_ipalib/test_errors.py b/ipatests/test_ipalib/test_errors.py
index 258af3b3f..dcff72191 100644
--- a/ipatests/test_ipalib/test_errors.py
+++ b/ipatests/test_ipalib/test_errors.py
@@ -26,6 +26,7 @@ import inspect
 
 from ipatests.util import assert_equal, raises
 from ipalib import errors, text
+from ipaplatform.paths import paths
 from ipalib.constants import TYPE_ERROR
 
 
@@ -102,9 +103,9 @@ class test_SubprocessError(PrivateExceptionTester):
         """
         Test the `ipalib.errors.SubprocessError.__init__` method.
         """
-        inst = self.new(returncode=1, argv=('/bin/false',))
+        inst = self.new(returncode=1, argv=(paths.BIN_FALSE,))
         assert inst.returncode == 1
-        assert inst.argv == ('/bin/false',)
+        assert inst.argv == (paths.BIN_FALSE,)
         assert str(inst) == "return code 1 from ('/bin/false',)"
         assert inst.message == str(inst)
 
diff --git a/ipatests/test_ipalib/test_plugable.py b/ipatests/test_ipalib/test_plugable.py
index c495e74dc..73b263a90 100644
--- a/ipatests/test_ipalib/test_plugable.py
+++ b/ipatests/test_ipalib/test_plugable.py
@@ -26,6 +26,7 @@ from ipatests.util import raises, no_set, no_del, read_only
 from ipatests.util import getitem, setitem, delitem
 from ipatests.util import ClassChecker, create_test_api
 from ipalib import plugable, errors, text
+from ipaplatform.paths import paths
 
 
 class test_SetProxy(ClassChecker):
@@ -277,10 +278,10 @@ class test_Plugin(ClassChecker):
         Test the `ipalib.plugable.Plugin.call` method.
         """
         o = self.cls()
-        o.call('/bin/true') is None
-        e = raises(errors.SubprocessError, o.call, '/bin/false')
+        o.call(paths.BIN_TRUE) is None
+        e = raises(errors.SubprocessError, o.call, paths.BIN_FALSE)
         assert e.returncode == 1
-        assert e.argv == ('/bin/false',)
+        assert e.argv == (paths.BIN_FALSE,)
 
 
 def test_Registrar():