IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Avoid skipping tests due to missing files

Browse Source 
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>
This commit is contained in:
Lenka Doudova 2016-09-01 09:46:17 +02:00 committed by Martin Basti
parent afcb3bd3c3
commit 72d7193ce2
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ipatests/test_install/test_updates.py
View File

@ -65,11 +65,9 @@ class test_update(unittest.TestCase):
self.updater = LDAPUpdate(dm_password=self.dm_password, sub_dict={}) self.updater = LDAPUpdate(dm_password=self.dm_password, sub_dict={})
self.ld = ipaldap.IPAdmin(fqdn) self.ld = ipaldap.IPAdmin(fqdn)
self.ld.do_simple_bind(bindpw=self.dm_password) self.ld.do_simple_bind(bindpw=self.dm_password)
if ipautil.file_exists("0_reset.update"): self.testdir = os.path.abspath(os.path.dirname(__file__))
self.testdir="./" if not ipautil.file_exists(os.path.join(self.testdir,
elif ipautil.file_exists("ipatests/test_install/0_reset.update"): "0_reset.update")):
self.testdir= "./ipatests/test_install/"
else:
raise nose.SkipTest("Unable to find test update files") raise nose.SkipTest("Unable to find test update files")
self.container_dn = DN(self.updater._template_str('cn=test, cn=accounts, $SUFFIX')) self.container_dn = DN(self.updater._template_str('cn=test, cn=accounts, $SUFFIX'))
@ -84,7 +82,8 @@ class test_update(unittest.TestCase):
Reset the updater test data to a known initial state (test_0_reset) Reset the updater test data to a known initial state (test_0_reset)
""" """
try: try:
modified = self.updater.update([self.testdir + "0_reset.update"]) modified = self.updater.update([os.path.join(self.testdir,
"0_reset.update")])
except errors.NotFound: except errors.NotFound:
# Just means the entry doesn't exist yet # Just means the entry doesn't exist yet
modified = True modified = True
@ -103,7 +102,8 @@ class test_update(unittest.TestCase):
""" """
Test the updater with an add directive (test_1_add) Test the updater with an add directive (test_1_add)
""" """
modified = self.updater.update([self.testdir + "1_add.update"]) modified = self.updater.update([os.path.join(self.testdir,
"1_add.update")])
self.assertTrue(modified) self.assertTrue(modified)
@ -137,7 +137,8 @@ class test_update(unittest.TestCase):
""" """
Test the updater when adding an attribute to an existing entry (test_2_update) Test the updater when adding an attribute to an existing entry (test_2_update)
""" """
modified = self.updater.update([self.testdir + "2_update.update"]) modified = self.updater.update([os.path.join(self.testdir,
"2_update.update")])
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
@ -150,7 +151,8 @@ class test_update(unittest.TestCase):
""" """
Test the updater forcing an attribute to a given value (test_3_update) Test the updater forcing an attribute to a given value (test_3_update)
""" """
modified = self.updater.update([self.testdir + "3_update.update"]) modified = self.updater.update([os.path.join(self.testdir,
"3_update.update")])
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
@ -163,7 +165,8 @@ class test_update(unittest.TestCase):
""" """
Test the updater adding a new value to a single-valued attribute (test_4_update) Test the updater adding a new value to a single-valued attribute (test_4_update)
""" """
modified = self.updater.update([self.testdir + "4_update.update"]) modified = self.updater.update([os.path.join(self.testdir,
"4_update.update")])
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
@ -176,7 +179,8 @@ class test_update(unittest.TestCase):
""" """
Test the updater adding a new value to a multi-valued attribute (test_5_update) Test the updater adding a new value to a multi-valued attribute (test_5_update)
""" """
modified = self.updater.update([self.testdir + "5_update.update"]) modified = self.updater.update([os.path.join(self.testdir,
"5_update.update")])
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
@ -189,7 +193,8 @@ class test_update(unittest.TestCase):
""" """
Test the updater removing a value from a multi-valued attribute (test_6_update) Test the updater removing a value from a multi-valued attribute (test_6_update)
""" """
modified = self.updater.update([self.testdir + "6_update.update"]) modified = self.updater.update([os.path.join(self.testdir,
"6_update.update")])
self.assertTrue(modified) self.assertTrue(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
@ -202,7 +207,8 @@ class test_update(unittest.TestCase):
""" """
Test the updater removing a non-existent value from a multi-valued attribute (test_6_update_1) Test the updater removing a non-existent value from a multi-valued attribute (test_6_update_1)
""" """
modified = self.updater.update([self.testdir + "6_update.update"]) modified = self.updater.update([os.path.join(self.testdir,
"6_update.update")])
self.assertFalse(modified) self.assertFalse(modified)
entries = self.ld.get_entries( entries = self.ld.get_entries(
@ -216,7 +222,8 @@ class test_update(unittest.TestCase):
Reset the test data to a known initial state (test_7_cleanup) Reset the test data to a known initial state (test_7_cleanup)
""" """
try: try:
modified = self.updater.update([self.testdir + "0_reset.update"]) modified = self.updater.update([os.path.join(self.testdir,
"0_reset.update")])
except errors.NotFound: except errors.NotFound:
# Just means the entry doesn't exist yet # Just means the entry doesn't exist yet
modified = True modified = True
@ -236,14 +243,16 @@ class test_update(unittest.TestCase):
Test the updater with an unknown keyword (test_8_badsyntax) Test the updater with an unknown keyword (test_8_badsyntax)
""" """
with self.assertRaises(BadSyntax): with self.assertRaises(BadSyntax):
modified = self.updater.update([self.testdir + "8_badsyntax.update"]) modified = self.updater.update(
[os.path.join(self.testdir, "8_badsyntax.update")])
def test_9_badsyntax(self): def test_9_badsyntax(self):
""" """
Test the updater with an incomplete line (test_9_badsyntax) Test the updater with an incomplete line (test_9_badsyntax)
""" """
with self.assertRaises(BadSyntax): with self.assertRaises(BadSyntax):
modified = self.updater.update([self.testdir + "9_badsyntax.update"]) modified = self.updater.update(
[os.path.join(self.testdir, "9_badsyntax.update")])
def test_from_dict(self): def test_from_dict(self):
""" """

11
ipatests/test_pkcs10/test_pkcs10.py
View File

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