Merge pull request #5 from boegel/checksums-itemdict

each entry in checksums may in turn be a list of different types of checksums

easybuild/framework/easyconfig/types.py

@@ -532,11 +532,12 @@ def ensure_iterable_license_specs(specs):
 # each entry can be:
 # a single checksum value (string)
 # a single checksum value of a specified type (2-tuple, 1st element is checksum type, 2nd element is checksum)
-# a list of checksums (of different types) as string values, which should *all* be valid
+# a list of checksums (of different types, perhaps different formats), which should *all* be valid
 # a dictionary with a mapping from filename to checksum value
-CHECKSUMS = (list, as_hashable({'elem_types': [str, tuple, LIST_OF_STRINGS, STRING_DICT]}))
+CHECKSUM_LIST = (list, as_hashable({'elem_types': [str, tuple, STRING_DICT]}))
+CHECKSUMS = (list, as_hashable({'elem_types': [str, tuple, STRING_DICT, CHECKSUM_LIST]}))
 
-CHECKABLE_TYPES = [CHECKSUMS, DEPENDENCIES, DEPENDENCY_DICT, LIST_OF_STRINGS,
+CHECKABLE_TYPES = [CHECKSUM_LIST, CHECKSUMS, DEPENDENCIES, DEPENDENCY_DICT, LIST_OF_STRINGS,
                    SANITY_CHECK_PATHS_DICT, STRING_DICT, STRING_OR_TUPLE_LIST, TOOLCHAIN_DICT, TUPLE_OF_STRINGS]
 
 # easy types, that can be verified with isinstance

test/framework/type_checking.py

@@ -202,6 +202,12 @@ def test_check_type_of_param_value_checksums(self):
                 ('md5', md5_checksum),
                 {'foo.txt': sha256_checksum2, 'bar.txt': sha256_checksum3},
             ],
+            # each item can be a list of checksums for a single file, which can be of different types...
+            [
+                [sha256_checksum1, sha256_checksum2, sha256_checksum3],
+                [sha256_checksum1, ('md5', md5_checksum), {'foo.txt': sha256_checksum2}],
+                [sha256_checksum1],
+            ]
         ]
         for inp in inputs:
             self.assertEqual(check_type_of_param_value('checksums', inp), (True, inp))