Use a more idiomatic check that a list is non-empty (`if mylist:`) and
simplify the function body by dedenting and using a dict to map between
the kunit TestStatus enum => KernelCI json status string.
The dict hopefully makes it less likely to have bugs like commit
9a6bb30a88 ("kunit: tool: fix --json output for skipped tests").
Signed-off-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
56 lines
1.4 KiB
Python
56 lines
1.4 KiB
Python
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Generates JSON from KUnit results according to
|
|
# KernelCI spec: https://github.com/kernelci/kernelci-doc/wiki/Test-API
|
|
#
|
|
# Copyright (C) 2020, Google LLC.
|
|
# Author: Heidi Fahim <heidifahim@google.com>
|
|
|
|
import json
|
|
import os
|
|
|
|
import kunit_parser
|
|
|
|
from kunit_parser import Test, TestStatus
|
|
from typing import Any, Dict
|
|
|
|
JsonObj = Dict[str, Any]
|
|
|
|
_status_map: Dict[TestStatus, str] = {
|
|
TestStatus.SUCCESS: "PASS",
|
|
TestStatus.SKIPPED: "SKIP",
|
|
TestStatus.TEST_CRASHED: "ERROR",
|
|
}
|
|
|
|
def _get_group_json(test: Test, def_config: str, build_dir: str) -> JsonObj:
|
|
sub_groups = [] # List[JsonObj]
|
|
test_cases = [] # List[JsonObj]
|
|
|
|
for subtest in test.subtests:
|
|
if subtest.subtests:
|
|
sub_group = _get_group_json(subtest, def_config,
|
|
build_dir)
|
|
sub_groups.append(sub_group)
|
|
continue
|
|
status = _status_map.get(subtest.status, "FAIL")
|
|
test_cases.append({"name": subtest.name, "status": status})
|
|
|
|
test_group = {
|
|
"name": test.name,
|
|
"arch": "UM",
|
|
"defconfig": def_config,
|
|
"build_environment": build_dir,
|
|
"sub_groups": sub_groups,
|
|
"test_cases": test_cases,
|
|
"lab_name": None,
|
|
"kernel": None,
|
|
"job": None,
|
|
"git_branch": "kselftest",
|
|
}
|
|
return test_group
|
|
|
|
def get_json_result(test: Test, def_config: str, build_dir: str) -> str:
|
|
test_group = _get_group_json(test, def_config, build_dir)
|
|
test_group["name"] = "KUnit Test Group"
|
|
return json.dumps(test_group, indent=4)
|