From 45244836e0eff95273ecff3663c56ae7aad8ec55 Mon Sep 17 00:00:00 2001 From: Emanuele Cesena Date: Tue, 28 May 2024 17:19:27 +0000 Subject: [PATCH 1/2] fix: mark tests that return None as skipped --- src/test_suite/multiprocessing_utils.py | 3 +++ src/test_suite/test_suite.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/test_suite/multiprocessing_utils.py b/src/test_suite/multiprocessing_utils.py index f181523..bbb6943 100644 --- a/src/test_suite/multiprocessing_utils.py +++ b/src/test_suite/multiprocessing_utils.py @@ -365,6 +365,9 @@ def build_test_results(results: dict[str, str | None]) -> tuple[int, dict | None protobuf_structures[target] = instruction_effects + if protobuf_structures[globals.solana_shared_library] is None: + return 0, None + test_case_passed = all( protobuf_structures[globals.solana_shared_library] == result for result in protobuf_structures.values() diff --git a/src/test_suite/test_suite.py b/src/test_suite/test_suite.py index 1c2962b..3501564 100644 --- a/src/test_suite/test_suite.py +++ b/src/test_suite/test_suite.py @@ -335,10 +335,12 @@ def run_tests( failed = 0 skipped = 0 failed_tests = [] + skipped_tests = [] target_log_files = {target: None for target in shared_libraries} for file_stem, status, stringified_results in test_case_results: if stringified_results is None: skipped += 1 + skipped_tests.append(file_stem) continue for target, string_result in stringified_results.items(): @@ -377,6 +379,7 @@ def run_tests( print(f"Passed: {passed}, Failed: {failed}, Skipped: {skipped}") if verbose: print(f"Failed tests: {failed_tests}") + print(f"Skipped tests: {skipped_tests}") @app.command() From d542b4e2df3af0d0efd603c09c7cd638129523e0 Mon Sep 17 00:00:00 2001 From: Emanuele Cesena Date: Tue, 28 May 2024 17:28:59 +0000 Subject: [PATCH 2/2] diff: use diff_effect_fn from harness ctx --- src/test_suite/multiprocessing_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test_suite/multiprocessing_utils.py b/src/test_suite/multiprocessing_utils.py index bbb6943..3f2d4ec 100644 --- a/src/test_suite/multiprocessing_utils.py +++ b/src/test_suite/multiprocessing_utils.py @@ -368,8 +368,9 @@ def build_test_results(results: dict[str, str | None]) -> tuple[int, dict | None if protobuf_structures[globals.solana_shared_library] is None: return 0, None + diff_effect_fn = globals.harness_ctx.diff_effect_fn test_case_passed = all( - protobuf_structures[globals.solana_shared_library] == result + diff_effect_fn(protobuf_structures[globals.solana_shared_library], result) for result in protobuf_structures.values() )