Skip to content

Commit

Permalink
Move deletion to static method
Browse files Browse the repository at this point in the history
  • Loading branch information
Rot127 committed Sep 9, 2024
1 parent 4ae6215 commit 19cfcea
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions suite/auto-sync/src/autosync/Tests/test_mcupdater.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ def setUpClass(cls):
)
cls.mutex = Lock()

@staticmethod
def del_path(file: Path):
if not file.exists():
return
logging.debug(f"Delete old file: {file}")
if file.is_dir():
shutil.rmtree(file)
else:
os.remove(file)

def test_test_case_gen(self):
"""
To enforce sequential execution of the tests, we execute them in here.
Expand All @@ -48,8 +58,7 @@ def unified_test_cases(self):
if not out_dir.exists():
out_dir.mkdir(parents=True)
for file in out_dir.iterdir():
logging.debug(f"Delete old file: {file}")
os.remove(file)
self.del_path(file)
test_only_overwrite_path_var(
"{MCUPDATER_OUT_DIR}",
out_dir,
Expand All @@ -67,8 +76,7 @@ def separated_test_cases(self):
if not out_dir.exists():
out_dir.mkdir(parents=True)
for file in out_dir.iterdir():
logging.debug(f"Delete old file: {file}")
os.remove(file)
self.del_path(file)
test_only_overwrite_path_var(
"{MCUPDATER_OUT_DIR}",
out_dir,
Expand All @@ -86,8 +94,7 @@ def multi_mode_unified_test_cases(self):
if not out_dir.exists():
out_dir.mkdir(parents=True)
for file in out_dir.iterdir():
logging.debug(f"Delete old file: {file}")
os.remove(file)
self.del_path(file)
test_only_overwrite_path_var(
"{MCUPDATER_OUT_DIR}",
out_dir,
Expand All @@ -112,8 +119,7 @@ def multi_mode_separated_test_cases(self):
if not out_dir.exists():
out_dir.mkdir(parents=True)
for file in out_dir.iterdir():
logging.debug(f"Delete old file: {file}")
os.remove(file)
self.del_path(file)
test_only_overwrite_path_var(
"{MCUPDATER_OUT_DIR}",
out_dir,
Expand All @@ -137,8 +143,7 @@ def test_no_symbol_tests(self):
if not out_dir.exists():
out_dir.mkdir(parents=True)
for file in out_dir.iterdir():
logging.debug(f"Delete old file: {file}")
os.remove(file)
self.del_path(file)
test_only_overwrite_path_var(
"{MCUPDATER_OUT_DIR}",
out_dir,
Expand All @@ -164,11 +169,7 @@ def test_systemz_mapping(self):
if not out_dir.exists():
out_dir.mkdir(parents=True)
for file in out_dir.iterdir():
logging.debug(f"Delete old file: {file}")
if file.is_dir():
shutil.rmtree(file)
else:
os.remove(file)
self.del_path(file)
test_only_overwrite_path_var(
"{MCUPDATER_OUT_DIR}",
out_dir,
Expand Down

0 comments on commit 19cfcea

Please sign in to comment.