diff options
author | Matt Clay <matt@mystile.com> | 2017-02-09 15:18:13 -0800 |
---|---|---|
committer | Matt Clay <matt@mystile.com> | 2017-02-09 15:19:01 -0800 |
commit | 256a25bdcc009e0a1977e9d03c67bec2ed371dde (patch) | |
tree | 6fcce98f21b8468239a8379b514ed278b726026f /test | |
parent | 403e9d35dff54395766fcf74ed79d294728c1672 (diff) | |
download | ansible-256a25bdcc009e0a1977e9d03c67bec2ed371dde.tar.gz |
Revert "Update galaxy and database unit tests."
Diffstat (limited to 'test')
-rw-r--r-- | test/units/cli/test_galaxy.py | 6 | ||||
-rw-r--r-- | test/units/module_utils/test_database.py | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index 901d5bd690..753e90c170 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -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 = [] diff --git a/test/units/module_utils/test_database.py b/test/units/module_utils/test_database.py index aa69db364d..675aed547a 100644 --- a/test/units/module_utils/test_database.py +++ b/test/units/module_utils/test_database.py @@ -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) |