mirielka's pull request #42: "Tests: Avoid skipping tests due to missing files" 
was opened

PR body:
"""
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.
Adding proper paths to test setup.

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

See the full pull-request at https://github.com/freeipa/freeipa/pull/42
... or pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/42/head:pr42
git checkout pr42
From 965e54f016f52bdfcddb05a08d49ba4a01af25b8 Mon Sep 17 00:00:00 2001
From: Lenka Doudova <ldoud...@redhat.com>
Date: Wed, 31 Aug 2016 15:51:51 +0200
Subject: [PATCH] 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.
Adding proper paths to test setup.

https://fedorahosted.org/freeipa/ticket/6284
---
 ipatests/test_install/test_updates.py | 2 ++
 ipatests/test_pkcs10/test_pkcs10.py   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ipatests/test_install/test_updates.py b/ipatests/test_install/test_updates.py
index b41a7c5..51301cc 100644
--- a/ipatests/test_install/test_updates.py
+++ b/ipatests/test_install/test_updates.py
@@ -69,6 +69,8 @@ def setUp(self):
             self.testdir="./"
         elif ipautil.file_exists("ipatests/test_install/0_reset.update"):
             self.testdir= "./ipatests/test_install/"
+        elif ipautil.file_exists("test_install/0_reset.update"):
+            self.testdir= "./test_install/"
         else:
             raise nose.SkipTest("Unable to find test update files")
 
diff --git a/ipatests/test_pkcs10/test_pkcs10.py b/ipatests/test_pkcs10/test_pkcs10.py
index 86de3c6..6a61709 100644
--- a/ipatests/test_pkcs10/test_pkcs10.py
+++ b/ipatests/test_pkcs10/test_pkcs10.py
@@ -45,6 +45,8 @@ def setup(self):
             self.testdir="./"
         elif ipautil.file_exists("ipatests/test_pkcs10/test0.csr"):
             self.testdir= "./ipatests/test_pkcs10/"
+        elif ipautil.file_exists("test_pkcs10/test0.csr"):
+            self.testdir= "./test_pkcs10/"
         else:
             raise nose.SkipTest("Unable to find test update files")
 
-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to