Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-07-21 04:51:12 +02:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

tests/run-multitests.py: Create a _result.json at end of run.

Browse Source 
Reuse the `create_test_report()` function from `run-tests.py` to generate a
`_result.json` file summarising the test run.  If there's more than one
permutation of the test run, only the last result is saved.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-06-10 22:13:33 +10:00
parent 2bc5af6945
commit 6db9c80856
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/run-multitests.py
View File

@@ -15,6 +15,8 @@ import itertools
import subprocess import subprocess
import tempfile import tempfile
run_tests_module = __import__("run-tests")
test_dir = os.path.abspath(os.path.dirname(__file__)) test_dir = os.path.abspath(os.path.dirname(__file__))
if os.path.abspath(sys.path[0]) == test_dir: if os.path.abspath(sys.path[0]) == test_dir:
@@ -488,9 +490,7 @@ def print_diff(a, b):
def run_tests(test_files, instances_truth, instances_test): def run_tests(test_files, instances_truth, instances_test):
skipped_tests = [] test_results = []
passed_tests = []
failed_tests = []
for test_file, num_instances in test_files: for test_file, num_instances in test_files:
instances_str = "|".join(str(instances_test[i]) for i in range(num_instances)) instances_str = "|".join(str(instances_test[i]) for i in range(num_instances))
@@ -526,13 +526,13 @@ def run_tests(test_files, instances_truth, instances_test):
# Print result of test # Print result of test
if skip: if skip:
print("skip") print("skip")
skipped_tests.append(test_file) test_results.append((test_file, "skip", ""))
elif output_test == output_truth: elif output_test == output_truth:
print("pass") print("pass")
passed_tests.append(test_file) test_results.append((test_file, "pass", ""))
else: else:
print("FAIL") print("FAIL")
failed_tests.append(test_file) test_results.append((test_file, "fail", ""))
if not cmd_args.show_output: if not cmd_args.show_output:
print("### TEST ###") print("### TEST ###")
print(output_test, end="") print(output_test, end="")
@@ -549,15 +549,7 @@ def run_tests(test_files, instances_truth, instances_test):
if cmd_args.show_output: if cmd_args.show_output:
print() print()
print("{} tests performed".format(len(skipped_tests) + len(passed_tests) + len(failed_tests))) return test_results
print("{} tests passed".format(len(passed_tests)))
if skipped_tests:
print("{} tests skipped: {}".format(len(skipped_tests), " ".join(skipped_tests)))
if failed_tests:
print("{} tests failed: {}".format(len(failed_tests), " ".join(failed_tests)))
return not failed_tests
def main(): def main():
@@ -583,6 +575,12 @@ def main():
default=1, default=1,
help="repeat the test with this many permutations of the instance order", help="repeat the test with this many permutations of the instance order",
) )
cmd_parser.add_argument(
"-r",
"--result-dir",
default=run_tests_module.base_path("results"),
help="directory for test results",
)
cmd_parser.epilog = ( cmd_parser.epilog = (
"Supported instance types:\r\n" "Supported instance types:\r\n"
" -i pyb:<port> physical device (eg. pyboard) on provided repl port.\n" " -i pyb:<port> physical device (eg. pyboard) on provided repl port.\n"
@@ -623,13 +621,15 @@ def main():
for _ in range(max_instances - len(instances_test)): for _ in range(max_instances - len(instances_test)):
instances_test.append(PyInstanceSubProcess([MICROPYTHON])) instances_test.append(PyInstanceSubProcess([MICROPYTHON]))
os.makedirs(cmd_args.result_dir, exist_ok=True)
all_pass = True all_pass = True
try: try:
for i, instances_test_permutation in enumerate(itertools.permutations(instances_test)): for i, instances_test_permutation in enumerate(itertools.permutations(instances_test)):
if i >= cmd_args.permutations: if i >= cmd_args.permutations:
break break
all_pass &= run_tests(test_files, instances_truth, instances_test_permutation) test_results = run_tests(test_files, instances_truth, instances_test_permutation)
all_pass &= run_tests_module.create_test_report(cmd_args, test_results)
finally: finally:
for i in instances_truth: for i in instances_truth: