Skip to content

Commit

Permalink
fix up test result ordering
Browse files Browse the repository at this point in the history
  • Loading branch information
aerickson committed Feb 5, 2024
1 parent abcebd1 commit 6be963a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions directory_cleaner/directory_cleaner.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ def _clean_non_recursive(self):
self.debug_print(f"- Skipped file/directory: {item_path}")
skipped_items.append(item_path)
return {
"skipped": skipped_items,
"deleted": deleted_items,
"errors": error_items,
"skipped": sorted(skipped_items),
"deleted": sorted(deleted_items),
"errors": sorted(error_items),
}


Expand Down
26 changes: 15 additions & 11 deletions directory_cleaner/directory_cleaner_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,21 @@ def test_directory_cleaner(self):
dc = DC.DirectoryCleaner(self.temp_dir1, exception_list)
result = dc.clean_directory()
# print(result)
assert result["deleted"] == [
str(Path(self.temp_dir1) / "junk2"),
str(Path(self.temp_dir1) / "generic-worker.cfg.bak"),
str(Path(self.temp_dir1) / "junk1"),
str(Path(self.temp_dir1) / "junk_dir/junk4"),
]
assert result["skipped"] == [
str(Path(self.temp_dir1) / "tasks"),
str(Path(self.temp_dir1) / "generic-worker.cfg"),
str(Path(self.temp_dir1) / "caches"),
]
assert result["deleted"] == sorted(
[
str(Path(self.temp_dir1) / "generic-worker.cfg.bak"),
str(Path(self.temp_dir1) / "junk1"),
str(Path(self.temp_dir1) / "junk2"),
str(Path(self.temp_dir1) / "junk_dir/junk4"),
]
)
assert result["skipped"] == sorted(
[
str(Path(self.temp_dir1) / "tasks"),
str(Path(self.temp_dir1) / "generic-worker.cfg"),
str(Path(self.temp_dir1) / "caches"),
]
)

def test_directory_cleaner_non_existent(self):
exception_list = ["generic-worker.cfg", "tasks", "caches"]
Expand Down

0 comments on commit 6be963a

Please sign in to comment.