cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Update galaxy and database unit tests."

Browse source
This commit is contained in:
Matt Clay 2017-02-09 15:18:13 -08:00
parent 403e9d35df
commit 256a25bdcc
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/units/cli/test_galaxy.py
View file

@ -39,10 +39,6 @@ class TestGalaxy(unittest.TestCase):
'''creating prerequisites for installing a role; setUpClass occurs ONCE whereas setUp occurs with every method tested.'''
# class data for easy viewing: role_dir, role_tar, role_name, role_req, role_path
cls.temp_dir = tempfile.mkdtemp('galaxy')
os.chdir(cls.temp_dir)
if os.path.exists("./delete_me"):
shutil.rmtree("./delete_me")
@ -92,8 +88,6 @@ class TestGalaxy(unittest.TestCase):
os.remove(cls.role_tar)
if os.path.isdir(cls.role_path):
shutil.rmtree(cls.role_path)
if os.path.isdir(cls.temp_dir):
shutil.rmtree(cls.temp_dir)
def setUp(self):
self.default_args = []

4
test/units/module_utils/test_database.py
View file

@ -73,8 +73,8 @@ HOW_MANY_DOTS = (
'PostgreSQL does not support column with more than 4 dots'),
)
VALID_QUOTES = sorted((test, VALID[test]) for test in VALID)
INVALID_QUOTES = sorted((test[0], test[1], INVALID[test]) for test in INVALID)
VALID_QUOTES = ((test, VALID[test]) for test in VALID)
INVALID_QUOTES = ((test[0], test[1], INVALID[test]) for test in INVALID)
@pytest.mark.parametrize("identifier, quoted_identifier", VALID_QUOTES)