From dcd0f739fa5c5b2aad2d384e0f28feaa41583de4 Mon Sep 17 00:00:00 2001 From: Marko Ristin Date: Sun, 25 Aug 2024 07:19:14 +0500 Subject: [PATCH] Replace test data first in the update script We need to remove *all* the test data as the specification can introduce breaking changes. We also need to replace the test data before generating the test code as breaking changes in specification cause the test code generation to fail since it runs a couple of preliminary consistency checks against the test data. --- ...te_to_aas_core_meta_codegen_and_testgen.py | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/_dev_scripts/update_to_aas_core_meta_codegen_and_testgen.py b/_dev_scripts/update_to_aas_core_meta_codegen_and_testgen.py index 12fd0199..9069b571 100644 --- a/_dev_scripts/update_to_aas_core_meta_codegen_and_testgen.py +++ b/_dev_scripts/update_to_aas_core_meta_codegen_and_testgen.py @@ -291,21 +291,9 @@ def _replace_test_data( print(f"Removing the test data from: {test_data_dir}") - for pth in [ - test_data_dir / name - for name in ( - "Descend", - "DescendOnce", - "DeserializationError", - "Json", - "VerificationError", - "Xml", - "XxxOrDefault", - ) - ]: - if pth.exists(): - print(f"Removing {pth} ...") - shutil.rmtree(pth) + for pth in [sub_pth for sub_pth in test_data_dir.iterdir() if sub_pth.is_dir()]: + print(f"Removing {pth} ...") + shutil.rmtree(pth) print(f"Copying the test data from: {aas_core_testgen_repo} ...") @@ -621,12 +609,12 @@ def main() -> int: aas_core_codegen_revision=aas_core_codegen_revision, ) + _replace_test_data(our_repo=our_repo, aas_core_testgen_repo=aas_core_testgen_repo) + exit_code = _generate_test_code(our_repo=our_repo) if exit_code is not None: return exit_code - _replace_test_data(our_repo=our_repo, aas_core_testgen_repo=aas_core_testgen_repo) - _reformat_code(our_repo=our_repo) _run_tests_and_rerecord(our_repo=our_repo)