forked from Minki/linux
9a6bb30a88
Currently, KUnit will report SKIPPED tests as having failed if one uses
--json.
Add the missing if statement to set the appropriate status ("SKIP").
See https://api.kernelci.org/schema-test-case.html:
"status": {
"type": "string",
"description": "The status of the execution of this test case",
"enum": ["PASS", "FAIL", "SKIP", "ERROR"],
"default": "PASS"
},
with this, we now can properly produce all four of the statuses.
Fixes: 5acaf6031f ("kunit: tool: Support skipped tests in kunit_tool")
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>
66 lines
1.8 KiB
Python
66 lines
1.8 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, TestResult, TestStatus
|
|
from typing import Any, Dict, Optional
|
|
|
|
JsonObj = Dict[str, Any]
|
|
|
|
def _get_group_json(test: Test, def_config: str,
|
|
build_dir: Optional[str]) -> JsonObj:
|
|
sub_groups = [] # List[JsonObj]
|
|
test_cases = [] # List[JsonObj]
|
|
|
|
for subtest in test.subtests:
|
|
if len(subtest.subtests):
|
|
sub_group = _get_group_json(subtest, def_config,
|
|
build_dir)
|
|
sub_groups.append(sub_group)
|
|
else:
|
|
test_case = {"name": subtest.name, "status": "FAIL"}
|
|
if subtest.status == TestStatus.SUCCESS:
|
|
test_case["status"] = "PASS"
|
|
elif subtest.status == TestStatus.SKIPPED:
|
|
test_case["status"] = "SKIP"
|
|
elif subtest.status == TestStatus.TEST_CRASHED:
|
|
test_case["status"] = "ERROR"
|
|
test_cases.append(test_case)
|
|
|
|
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_result: TestResult, def_config: str,
|
|
build_dir: Optional[str], json_path: str) -> str:
|
|
test_group = _get_group_json(test_result.test, def_config, build_dir)
|
|
test_group["name"] = "KUnit Test Group"
|
|
json_obj = json.dumps(test_group, indent=4)
|
|
if json_path != 'stdout':
|
|
with open(json_path, 'w') as result_path:
|
|
result_path.write(json_obj)
|
|
root = __file__.split('tools/testing/kunit/')[0]
|
|
kunit_parser.print_with_timestamp(
|
|
"Test results stored in %s" %
|
|
os.path.join(root, result_path.name))
|
|
return json_obj
|