From 3fbdd26257d592c8edfeb3b15f97815de4f7ef02 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Fri, 20 Sep 2024 14:58:07 -0700 Subject: [PATCH] [DEV] Cross platform test fixture helpers (#1058) --- tests/expected_download.py | 8 +++----- tests/unit/utils/test_logger.py | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/expected_download.py b/tests/expected_download.py index 7a9875c5..bdb97e14 100644 --- a/tests/expected_download.py +++ b/tests/expected_download.py @@ -15,14 +15,12 @@ _EXPECTED_DOWNLOADS_SUMMARY_PATH = RESOURCE_PATH / "expected_downloads_summaries def _get_files_in_directory(relative_directory: Path | str) -> List[Path]: - relative_path_part_idx = 3 # Cuts /tmp/ - if IS_WINDOWS: - relative_path_part_idx = 7 # Cuts C:\Users\\AppData\Local\Temp\ - relative_file_paths: List[Path] = [] for path in Path(relative_directory).rglob("*"): if path.is_file(): - relative_path = Path(*path.parts[relative_path_part_idx:]) + relative_path = Path( + str(path).removeprefix(str(relative_directory)).removeprefix(os.path.sep) + ) relative_file_paths.append(relative_path) return relative_file_paths diff --git a/tests/unit/utils/test_logger.py b/tests/unit/utils/test_logger.py index 97ce6bbd..1d39de5b 100644 --- a/tests/unit/utils/test_logger.py +++ b/tests/unit/utils/test_logger.py @@ -133,6 +133,7 @@ class TestLogger: except ValueError as exc: Logger.log_exception(exception=exc) + time.sleep(0.1) # flush time Logger.cleanup(has_error=has_error) assert not os.path.isfile(Logger.debug_log_filename())