saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't fail if target path directory exists already

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2022-12-05 09:30:38 +00:00 • committed by Megan Wilhite
parent 0192f6e511
commit 23a2359e7d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/conftest.py
View file

@ -769,10 +769,16 @@ def integration_files_dir(salt_factories):
dirname = salt_factories.root_dir / "integration-files"
dirname.mkdir(exist_ok=True)
for child in (PYTESTS_DIR / "integration" / "files").iterdir():
destpath = dirname / child.name
if child.is_dir():
shutil.copytree(str(child), str(dirname / child.name))
if sys.version_info >= (3, 8):
shutil.copytree(str(child), str(destpath), dirs_exist_ok=True)
else:
if destpath.exists():
shutil.rmtree(str(destpath), ignore_errors=True)
shutil.copytree(str(child), str(destpath))
else:
shutil.copyfile(str(child), str(dirname / child.name))
shutil.copyfile(str(child), str(destpath))
return dirname