diff --git a/python/helpers/generator3.py b/python/helpers/generator3.py index c1926b532e5e..24d6a5acc3b8 100644 --- a/python/helpers/generator3.py +++ b/python/helpers/generator3.py @@ -364,9 +364,13 @@ def build_cache_dir_path(subdir, mod_qname, mod_path): def module_hash(mod_qname, mod_path): # Hash the content of a physical module if mod_path: - return physical_module_hash(mod_path) + hash_ = physical_module_hash(mod_path) else: - return builtin_module_hash(mod_qname) + hash_ = builtin_module_hash(mod_qname) + # Use shorter hashes in test data as it might affect developers on Windows + if is_test_mode(): + return hash_[:10] + return hash_ def builtin_module_hash(mod_qname): diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d6717de698818af85dc9ca0a8c44bf7c7a93986d70e4b8183d884e5/.failed__extra b/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d/.failed__extra similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d6717de698818af85dc9ca0a8c44bf7c7a93986d70e4b8183d884e5/.failed__extra rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d/.failed__extra diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d6717de698818af85dc9ca0a8c44bf7c7a93986d70e4b8183d884e5/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d6717de698818af85dc9ca0a8c44bf7c7a93986d70e4b8183d884e5/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_extra_module_that_fails/after/cache/bd21c4de4d/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/bar.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c3/bar.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/bar.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c3/bar.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/foo.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c3/foo.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/foo.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c3/foo.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c3/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c31daf79c0ee90a2831e3ea4a58b33fa13466ff4fa1e10f7ed7ea553/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/binary_declares_multiple_modules/after/cache/c41f8e38c3/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_generated_and_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_generated_and_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_generated_and_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_generated_and_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_regenerated_when_sdk_skeleton_generation_failed_for_modified_binary/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_regenerated_when_sdk_skeleton_generation_failed_for_modified_binary/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_regenerated_when_sdk_skeleton_generation_failed_for_modified_binary/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_regenerated_when_sdk_skeleton_generation_failed_for_modified_binary/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/before/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_generation_failed/before/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/before/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_missing/before/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/before/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/cache_skeleton_reused_when_sdk_skeleton_is_outdated/before/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py2/after/cache/407ff51bddb497989ea1ad7519078e42007289b2eee45e76d9a938dcaabb040d/.failed__mod b/python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py2/after/cache/407ff51bdd/.failed__mod similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py2/after/cache/407ff51bddb497989ea1ad7519078e42007289b2eee45e76d9a938dcaabb040d/.failed__mod rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py2/after/cache/407ff51bdd/.failed__mod diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py3/after/cache/12b1e3ccd3b36428ab42a2fcb2cf042c093e43a22f558c4d0d71a4419c132bf4/.failed__mod b/python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py3/after/cache/12b1e3ccd3/.failed__mod similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py3/after/cache/12b1e3ccd3b36428ab42a2fcb2cf042c093e43a22f558c4d0d71a4419c132bf4/.failed__mod rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/inaccessible_class_attribute_py3/after/cache/12b1e3ccd3/.failed__mod diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/before/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/origin_stamp_in_skeleton_header_is_updated_on_copying/before/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/segmentation_fault_handling/after/cache/7f2e78ed6fb1389a72a0244f4cfec286dc28ac191a5269b6e7d7ecbda438b80e/.failed__sigsegv b/python/helpers/tests/generator3_tests/data/SkeletonCaching/segmentation_fault_handling/after/cache/7f2e78ed6f/.failed__sigsegv similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/segmentation_fault_handling/after/cache/7f2e78ed6fb1389a72a0244f4cfec286dc28ac191a5269b6e7d7ecbda438b80e/.failed__sigsegv rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/segmentation_fault_handling/after/cache/7f2e78ed6f/.failed__sigsegv diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/after/cache/c69566d6cdf2510c695b9ad89f537c5d0211b9f63e36da6a4bc24537d797857d/.failed__failing b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/after/cache/c69566d6cd/.failed__failing similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/after/cache/c69566d6cdf2510c695b9ad89f537c5d0211b9f63e36da6a4bc24537d797857d/.failed__failing rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/after/cache/c69566d6cd/.failed__failing diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/before/cache/c69566d6cdf2510c695b9ad89f537c5d0211b9f63e36da6a4bc24537d797857d/.failed__failing b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/before/cache/c69566d6cd/.failed__failing similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/before/cache/c69566d6cdf2510c695b9ad89f537c5d0211b9f63e36da6a4bc24537d797857d/.failed__failing rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_failed_module_on_same_generator_version/before/cache/c69566d6cd/.failed__failing diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/before/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_with_earlier_update_stamp/before/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/before/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_not_regenerated_for_upgraded_generator_without_explicit_version_stamp/before/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/436f6de28726501973ddd9fb91fa92c6ec6225e5c28d8fbdb698dc1720e43714/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/436f6de287/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/436f6de28726501973ddd9fb91fa92c6ec6225e5c28d8fbdb698dc1720e43714/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/436f6de287/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/9ce58f4a1ca20495c75bcfb7ef29c947b2de9f9ae0642c33cae59cd393e325b5/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/9ce58f4a1c/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/9ce58f4a1ca20495c75bcfb7ef29c947b2de9f9ae0642c33cae59cd393e325b5/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/after/cache/9ce58f4a1c/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/before/cache/9ce58f4a1ca20495c75bcfb7ef29c947b2de9f9ae0642c33cae59cd393e325b5/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/before/cache/9ce58f4a1c/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/before/cache/9ce58f4a1ca20495c75bcfb7ef29c947b2de9f9ae0642c33cae59cd393e325b5/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_changed_module/before/cache/9ce58f4a1c/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/after/cache/4428cf79596fc6402950d97a2573d096aded1a226986e0583a76e3c2d4561e38/failing.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/after/cache/4428cf7959/failing.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/after/cache/4428cf79596fc6402950d97a2573d096aded1a226986e0583a76e3c2d4561e38/failing.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/after/cache/4428cf7959/failing.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/before/cache/4428cf79596fc6402950d97a2573d096aded1a226986e0583a76e3c2d4561e38/.failed b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/before/cache/4428cf7959/.failed similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/before/cache/4428cf79596fc6402950d97a2573d096aded1a226986e0583a76e3c2d4561e38/.failed rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_failed_module_on_generator_upgrade/before/cache/4428cf7959/.failed diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/after/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/after/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/after/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py b/python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/before/cache/e3b0c44298/mod.py similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/before/cache/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/mod.py rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/skeleton_regenerated_for_upgraded_generator_with_explicit_update_stamp/before/cache/e3b0c44298/mod.py diff --git a/python/helpers/tests/generator3_tests/data/SkeletonCaching/version_stamp_put_in_cache_directory_for_failed_module/after/cache/4428cf79596fc6402950d97a2573d096aded1a226986e0583a76e3c2d4561e38/.failed__failing b/python/helpers/tests/generator3_tests/data/SkeletonCaching/version_stamp_put_in_cache_directory_for_failed_module/after/cache/4428cf7959/.failed__failing similarity index 100% rename from python/helpers/tests/generator3_tests/data/SkeletonCaching/version_stamp_put_in_cache_directory_for_failed_module/after/cache/4428cf79596fc6402950d97a2573d096aded1a226986e0583a76e3c2d4561e38/.failed__failing rename to python/helpers/tests/generator3_tests/data/SkeletonCaching/version_stamp_put_in_cache_directory_for_failed_module/after/cache/4428cf7959/.failed__failing diff --git a/python/helpers/tests/generator3_tests/test_generation.py b/python/helpers/tests/generator3_tests/test_generation.py index b0b3f4e9e76f..c0a9f1b1caa6 100644 --- a/python/helpers/tests/generator3_tests/test_generation.py +++ b/python/helpers/tests/generator3_tests/test_generation.py @@ -125,11 +125,11 @@ class SkeletonCachingTest(GeneratorTestCase): _ast.py sdk_skeletons/ _ast.py - """.format(hash=generator3.builtin_module_hash('_ast'))) + """.format(hash=generator3.builtin_module_hash('_ast')[:10])) def test_builtins_generation_mode_stores_all_skeletons_in_same_cache_directory(self): self.run_generator(builtins=True) - builtins_hash = generator3.builtin_module_hash('sys') + builtins_hash = generator3.builtin_module_hash('sys')[:10] builtins_cache_dir = os.path.join(self.temp_cache_dir, builtins_hash) self.assertTrue(os.path.isdir(builtins_cache_dir)) builtin_mod_skeletons = os.listdir(builtins_cache_dir) @@ -145,7 +145,7 @@ class SkeletonCachingTest(GeneratorTestCase): mod.py sdk_skeletons/ mod.py - """.format(hash=generator3.physical_module_hash(mod_path))) + """.format(hash=generator3.physical_module_hash(mod_path)[:10])) def test_layout_for_physical_module_inside_package(self): mod_path = self.get_test_data_path('pkg/subpkg/mod.py') @@ -164,7 +164,7 @@ class SkeletonCachingTest(GeneratorTestCase): subpkg/ __init__.py mod.py - """.format(hash=generator3.physical_module_hash(mod_path))) + """.format(hash=generator3.physical_module_hash(mod_path)[:10])) def test_skeleton_regenerated_for_changed_module(self): self.check_generator_output('mod', mod_path='mod.py', mod_root='versions/v2')