almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

tests: Cleanup on failure of in_tempdir

Browse Source 
Otherwise other tests will also fail when they try to run from the wrong
directory.

(cherry picked from commit 65b8a2be68)
This commit is contained in:
Brian C. Lane 2019-04-15 14:06:48 -07:00
parent eb4a8ac3b1
commit 94e2651cf6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/pylorax/test_ltmpl.py
View File

@ -84,7 +84,9 @@ def in_tempdir(prefix='tmp'):
oldcwd = os.getcwd() oldcwd = os.getcwd()
tmpdir = tempfile.mkdtemp(prefix=prefix) tmpdir = tempfile.mkdtemp(prefix=prefix)
os.chdir(tmpdir) os.chdir(tmpdir)
try:
yield yield
finally:
os.chdir(oldcwd) os.chdir(oldcwd)
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)

2
tests/pylorax/test_server.py
View File

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