tests: Cleanup on failure of in_tempdir
Otherwise other tests will also fail when they try to run from the wrong directory.
This commit is contained in:
parent
933fad9ded
commit
65b8a2be68
@ -84,9 +84,11 @@ def in_tempdir(prefix='tmp'):
|
||||
oldcwd = os.getcwd()
|
||||
tmpdir = tempfile.mkdtemp(prefix=prefix)
|
||||
os.chdir(tmpdir)
|
||||
yield
|
||||
os.chdir(oldcwd)
|
||||
shutil.rmtree(tmpdir)
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
os.chdir(oldcwd)
|
||||
shutil.rmtree(tmpdir)
|
||||
|
||||
def makeFakeRPM(repo_dir, name, epoch, version, release, files=None):
|
||||
"""Make a fake rpm file in repo_dir"""
|
||||
|
@ -1559,9 +1559,11 @@ def in_tempdir(prefix='tmp'):
|
||||
oldcwd = os.getcwd()
|
||||
tmpdir = tempfile.mkdtemp(prefix=prefix)
|
||||
os.chdir(tmpdir)
|
||||
yield
|
||||
os.chdir(oldcwd)
|
||||
shutil.rmtree(tmpdir)
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
os.chdir(oldcwd)
|
||||
shutil.rmtree(tmpdir)
|
||||
|
||||
def makeFakeRPM(repo_dir, name, epoch, version, release):
|
||||
"""Make a fake rpm file in repo_dir"""
|
||||
|
Loading…
Reference in New Issue
Block a user