Tests: Avoid skipping tests due to missing files

When running test_install/test_updates and test_pkcs10/test_pkcs10 as
outoftree, these are skipped with reason 'Unable to find test update files'.
For outoftree tests wrong paths are checked for these files.
Changing file localization to provide proper test setup.

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

Reviewed-By: Martin Basti <mbasti@redhat.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/ipatests/test_pkcs10/test_pkcs10.py b/ipatests/test_pkcs10/test_pkcs10.py
index 86de3c696..4c5e09d04 100644
--- a/ipatests/test_pkcs10/test_pkcs10.py
+++ b/ipatests/test_pkcs10/test_pkcs10.py
@@ -31,6 +31,7 @@ from ipapython import ipautil
 import nss.nss as nss
 from nss.error import NSPRError
 import pytest
+import os
 
 
 @pytest.mark.tier0
@@ -41,15 +42,13 @@ class test_update(object):
 
     def setup(self):
         nss.nss_init_nodb()
-        if ipautil.file_exists("test0.csr"):
-            self.testdir="./"
-        elif ipautil.file_exists("ipatests/test_pkcs10/test0.csr"):
-            self.testdir= "./ipatests/test_pkcs10/"
-        else:
+        self.testdir = os.path.abspath(os.path.dirname(__file__))
+        if not ipautil.file_exists(os.path.join(self.testdir,
+                                                "test0.csr")):
             raise nose.SkipTest("Unable to find test update files")
 
     def read_file(self, filename):
-        fp = open(self.testdir + filename, "r")
+        fp = open(os.path.join(self.testdir, filename), "r")
         data = fp.read()
         fp.close()
         return data