diff --git a/test-cnm/pyproject.toml b/test-cnm/pyproject.toml index 06c16f9..24b8fd8 100644 --- a/test-cnm/pyproject.toml +++ b/test-cnm/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [project] name = "test-cnm" -version = "0.10.0" +version = "0.10.1" description = "" license = "Apache-2.0" authors = [ diff --git a/test-cnm/test_cnm/tester/collector.py b/test-cnm/test_cnm/tester/collector.py index 2fe713f..c2761b3 100644 --- a/test-cnm/test_cnm/tester/collector.py +++ b/test-cnm/test_cnm/tester/collector.py @@ -10,7 +10,7 @@ log = logging.getLogger(__name__) -DATA_VERSION_PATTERN = re.compile(r"^\d+\.\d+|\d$") +DATA_VERSION_PATTERN = re.compile(r"^\d+\.\d+|\d+$") class BucketTestCollector: diff --git a/test-cnm/tests/test_cli/test_cmd_list.py b/test-cnm/tests/test_cli/test_cmd_list.py index 0d878fd..1bcde0c 100644 --- a/test-cnm/tests/test_cli/test_cmd_list.py +++ b/test-cnm/tests/test_cli/test_cmd_list.py @@ -30,6 +30,9 @@ def test_bucket(test_bucket): test_bucket.Object("DATA_VERSION_2/1/PRODUCT_1/file1.txt").put(Body=b"") test_bucket.Object("DATA_VERSION_2/1/PRODUCT_1/file2.txt").put(Body=b"") + test_bucket.Object("DATA_VERSION_3/003/PRODUCT_1/file1.txt").put(Body=b"") + test_bucket.Object("DATA_VERSION_3/003/PRODUCT_1/file2.txt").put(Body=b"") + test_bucket.Object("OTHER_COLLECTION/PRODUCT_1/file1.txt").put(Body=b"") test_bucket.Object("OTHER_COLLECTION/PRODUCT_1/file2.txt").put(Body=b"") @@ -52,10 +55,12 @@ def test_list_all(capcli): - DATA_VERSION_1/1.0/PRODUCT_1 (2 files) DATA_VERSION_2: - DATA_VERSION_2/1/PRODUCT_1 (2 files) + DATA_VERSION_3: + - DATA_VERSION_3/003/PRODUCT_1 (2 files) OTHER_COLLECTION: - OTHER_COLLECTION/PRODUCT_1 (2 files) - Totals: 5 Collections; 6 Tests + Totals: 6 Collections; 7 Tests """.lstrip("\n") ) @@ -122,11 +127,15 @@ def test_list_files(capcli): - DATA_VERSION_2/1/PRODUCT_1 (2 files) ├── file1.txt └── file2.txt + DATA_VERSION_3: + - DATA_VERSION_3/003/PRODUCT_1 (2 files) + ├── file1.txt + └── file2.txt OTHER_COLLECTION: - OTHER_COLLECTION/PRODUCT_1 (2 files) ├── file1.txt └── file2.txt - Totals: 5 Collections; 6 Tests + Totals: 6 Collections; 7 Tests """.lstrip("\n") )