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, 7 insertions, 4 deletions

diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py
index bd55c8583..759fa8dcc 100644
--- a/ipatests/test_xmlrpc/test_automount_plugin.py
+++ b/ipatests/test_xmlrpc/test_automount_plugin.py
@@ -32,6 +32,7 @@ from ipapython.dn import DN
 
 from nose.tools import raises, assert_raises  # pylint: disable=E0611
 from xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipaplatform.paths import paths
 from ipatests.util import assert_deepequal
 
 
diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py
index 508e9141a..af9994430 100644
--- a/ipatests/test_xmlrpc/test_cert_plugin.py
+++ b/ipatests/test_xmlrpc/test_cert_plugin.py
@@ -33,6 +33,7 @@ import tempfile
 from ipapython import ipautil
 import nose
 import base64
+from ipaplatform.paths import paths
 from ipapython.dn import DN
 
 # So we can save the cert from issuance and compare it later
@@ -78,7 +79,7 @@ class test_cert(XMLRPC_test):
         is_db_configured()
 
     def run_certutil(self, args, stdin=None):
-        new_args = ["/usr/bin/certutil", "-d", self.reqdir]
+        new_args = [paths.CERTUTIL, "-d", self.reqdir]
         new_args = new_args + args
         return ipautil.run(new_args, stdin)
 
@@ -105,7 +106,7 @@ class test_cert(XMLRPC_test):
     def generateCSR(self, subject):
         self.run_certutil(["-R", "-s", subject,
                            "-o", self.reqfile,
-                           "-z", "/etc/group",
+                           "-z", paths.GROUP,
                            "-f", self.pwname,
                            "-a",
                            ])
diff --git a/ipatests/test_xmlrpc/testcert.py b/ipatests/test_xmlrpc/testcert.py
index ead6ee7f5..77179fc78 100644
--- a/ipatests/test_xmlrpc/testcert.py
+++ b/ipatests/test_xmlrpc/testcert.py
@@ -31,6 +31,7 @@ import shutil
 from ipalib import api, x509
 from ipaserver.plugins import rabase
 from ipapython import ipautil
+from ipaplatform.paths import paths
 from ipapython.dn import DN
 
 _testcert = None
@@ -52,7 +53,7 @@ def run_certutil(reqdir, args, stdin=None):
     """
     Run an NSS certutil command
     """
-    new_args = ["/usr/bin/certutil", "-d", reqdir]
+    new_args = [paths.CERTUTIL, "-d", reqdir]
     new_args = new_args + args
     return ipautil.run(new_args, stdin)
 
@@ -64,7 +65,7 @@ def generate_csr(reqdir, pwname, subject):
     req_path = os.path.join(reqdir, 'req')
     run_certutil(reqdir, ["-R", "-s", subject,
                           "-o", req_path,
-                          "-z", "/etc/group",
+                          "-z", paths.GROUP,
                           "-f", pwname,
                           "-a"])
     with open(req_path, "r") as fp: