From 905293a6c9bb8bfe3927090c623c028ecaa858a4 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 9 Apr 2021 17:14:58 +0800 Subject: [PATCH 1/2] ci: add helper info for tests with no config --- tools/ci/config/target-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 8883dcd02b..061a7011a1 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -24,7 +24,8 @@ script: - *define_config_file_name # first test if config file exists, if not exist, exit 0 - - test -e $CONFIG_FILE || exit 0 + - | + { [[ -e $CONFIG_FILE ]]; } || { echo 'No config file found. Consider decreasing the parallel count of this job in ".gitlab/ci/target-test.yml"'; exit 0; } # clone test env configs - retry_failed git clone $TEST_ENV_CONFIG_REPO - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs From 7d7ad29d5a54129dfbf10c32974859c922d79ea9 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 9 Apr 2021 16:37:31 +0800 Subject: [PATCH 2/2] fix(ci): return as failed when no test case result generated --- tools/ci/python_packages/tiny_test_fw/TinyFW.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/ci/python_packages/tiny_test_fw/TinyFW.py b/tools/ci/python_packages/tiny_test_fw/TinyFW.py index 41b7259792..6825dd8f69 100644 --- a/tools/ci/python_packages/tiny_test_fw/TinyFW.py +++ b/tools/ci/python_packages/tiny_test_fw/TinyFW.py @@ -199,6 +199,7 @@ def test_method(**kwargs): junit_test_case = JunitReport.create_test_case(format_case_id(case_info['ID'], target=env_inst.default_dut_cls.TARGET)) result = False + unexpected_error = False try: Utility.console_log('starting running test: ' + test_func.__name__, color='green') # execute test function @@ -209,6 +210,7 @@ def test_method(**kwargs): junit_test_case.add_failure_info(str(e)) except Exception as e: Utility.handle_unexpected_exception(junit_test_case, e) + unexpected_error = True finally: # do close all DUTs, if result is False then print DUT debug info close_errors = env_inst.close(dut_debug=(not result)) @@ -222,7 +224,7 @@ def test_method(**kwargs): for error in close_errors: junit_test_case.add_failure_info(str(error)) result = False - if not case_info['junit_report_by_case']: + if not case_info['junit_report_by_case'] or unexpected_error: JunitReport.test_case_finish(junit_test_case) # end case and output result