From 2d7c8cf56b258d3325575129bd263863305d23f8 Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Thu, 1 Feb 2024 13:25:33 -0500 Subject: [PATCH] test: account for nested directories --- .../modeldata/dmod/test/it_object_store_dataset_manager.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/python/lib/modeldata/dmod/test/it_object_store_dataset_manager.py b/python/lib/modeldata/dmod/test/it_object_store_dataset_manager.py index 7b1edf5f3..3f92a4bc3 100644 --- a/python/lib/modeldata/dmod/test/it_object_store_dataset_manager.py +++ b/python/lib/modeldata/dmod/test/it_object_store_dataset_manager.py @@ -101,7 +101,7 @@ def setUp(self) -> None: def tearDown(self) -> None: # Remove testing datasets slated to be cleaned up for dataset_name in self._datasets_to_cleanup: - for obj in self.minio_client.list_objects(dataset_name): + for obj in self.minio_client.list_objects(dataset_name, recursive=True): self.minio_client.remove_object(dataset_name, obj.object_name) self.minio_client.remove_bucket(dataset_name) @@ -176,10 +176,7 @@ def test_add_data_1_d(self): one_files_name = 'GIT_USAGE.md' one_file = dir_to_add.joinpath(one_files_name) one_files_expected_data = one_file.read_bytes() - num_uploaded_files = 0 - for p in dir_to_add.iterdir(): - if p.is_file(): - num_uploaded_files += 1 + num_uploaded_files = sum([len(files) for _, _, files in os.walk(dir_to_add)]) # This is actually one more, because of the serialized dataset state file expected_num_files = num_uploaded_files + 1