tests: Cleanup on failure of in_tempdir

Otherwise other tests will also fail when they try to run from the wrong directory.
2019-04-15 14:06:48 -07:00 · 2019-04-15 14:06:48 -07:00 · 65b8a2be68
commit 65b8a2be68
parent 933fad9ded
2 changed files with 10 additions and 6 deletions
--- a/tests/pylorax/test_ltmpl.py
+++ b/tests/pylorax/test_ltmpl.py
@ -84,7 +84,9 @@ def in_tempdir(prefix='tmp'):
    oldcwd = os.getcwd()
    tmpdir = tempfile.mkdtemp(prefix=prefix)
    os.chdir(tmpdir)
+    try:
        yield
+    finally:
        os.chdir(oldcwd)
        shutil.rmtree(tmpdir)

--- a/tests/pylorax/test_server.py
+++ b/tests/pylorax/test_server.py
@ -1559,7 +1559,9 @@ def in_tempdir(prefix='tmp'):
    oldcwd = os.getcwd()
    tmpdir = tempfile.mkdtemp(prefix=prefix)
    os.chdir(tmpdir)
+    try:
        yield
+    finally:
        os.chdir(oldcwd)
        shutil.rmtree(tmpdir)