almalinux/lorax
13
0
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.
This commit is contained in:
Brian C. Lane 2019-04-15 14:06:48 -07:00
parent 933fad9ded
commit 65b8a2be68
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/pylorax/test_ltmpl.py
View File

@ -84,9 +84,11 @@ 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)
yield try:
os.chdir(oldcwd) yield
shutil.rmtree(tmpdir) finally:
os.chdir(oldcwd)
shutil.rmtree(tmpdir)
def makeFakeRPM(repo_dir, name, epoch, version, release, files=None): def makeFakeRPM(repo_dir, name, epoch, version, release, files=None):
"""Make a fake rpm file in repo_dir""" """Make a fake rpm file in repo_dir"""

8
tests/pylorax/test_server.py
View File

@ -1559,9 +1559,11 @@ 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)
yield try:
os.chdir(oldcwd) yield
shutil.rmtree(tmpdir) finally:
os.chdir(oldcwd)
shutil.rmtree(tmpdir)
def makeFakeRPM(repo_dir, name, epoch, version, release): def makeFakeRPM(repo_dir, name, epoch, version, release):
"""Make a fake rpm file in repo_dir""" """Make a fake rpm file in repo_dir"""