From 9d22bfc9d0c4092dba1af0ee11a4c51b7b270786 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Lothor=C3=A9?= Date: Wed, 2 Aug 2023 16:17:17 +0200 Subject: [PATCH] scripts/resulttool: allow to replace test raw status with custom string MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add a STATUS_STRINGS dictionnary matching raw statuses to custom strings. Whenever a regression must be reported, raw status is searched in the custom statuses dict (key search is case insensitive). If no custom string is found, raw status is kept and used in regression report Signed-off-by: Alexis Lothoré Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- scripts/lib/resulttool/regression.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/lib/resulttool/regression.py b/scripts/lib/resulttool/regression.py index f80a9182a9a..3a23d7fc0a0 100644 --- a/scripts/lib/resulttool/regression.py +++ b/scripts/lib/resulttool/regression.py @@ -74,6 +74,9 @@ OESELFTEST_METADATA_GUESS_TABLE={ } } +STATUS_STRINGS = { +} + def test_has_at_least_one_matching_tag(test, tag_list): return "oetags" in test and any(oetag in tag_list for oetag in test["oetags"]) @@ -173,6 +176,9 @@ def can_be_compared(logger, base, target): return ret and metadata_matches(base_configuration, target_configuration) \ and machine_matches(base_configuration, target_configuration) +def get_status_str(raw_status): + raw_status_lower = raw_status.lower() if raw_status else "None" + return STATUS_STRINGS.get(raw_status_lower, raw_status) def compare_result(logger, base_name, target_name, base_result, target_result): base_result = base_result.get('result') @@ -205,7 +211,7 @@ def compare_result(logger, base_name, target_name, base_result, target_result): resultstring = "Regression: %s\n %s\n" % (base_name, target_name) for k in sorted(result): if not result[k]['target'] or not result[k]['target'].startswith("PASS"): - resultstring += ' %s: %s -> %s\n' % (k, result[k]['base'], result[k]['target']) + resultstring += ' %s: %s -> %s\n' % (k, get_status_str(result[k]['base']), get_status_str(result[k]['target'])) if new_pass_count > 0: resultstring += f' Additionally, {new_pass_count} previously failing test(s) is/are now passing\n' else: -- 2.47.2