espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci/runner_py_consider_no_junit_report_as_succeeded_v4.3' into 'release/v4.3'

Browse Source 
CI: runner py consider no test case as succeeded (v4.3)

See merge request espressif/esp-idf!13250
This commit is contained in:
Anton Maklakov
2021-04-21 10:23:58 +00:00
parent 949a3cd61a 7d7ad29d5a
commit 759e4340a9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/ci/config/target-test.yml
View File

@@ -24,7 +24,8 @@
script: script:
- *define_config_file_name - *define_config_file_name
# first test if config file exists, if not exist, exit 0 # 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 # clone test env configs
- retry_failed git clone $TEST_ENV_CONFIG_REPO - retry_failed git clone $TEST_ENV_CONFIG_REPO
- python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs

4
tools/ci/python_packages/tiny_test_fw/TinyFW.py
View File

@@ -199,6 +199,7 @@ def test_method(**kwargs):
junit_test_case = JunitReport.create_test_case(format_case_id(case_info['ID'], junit_test_case = JunitReport.create_test_case(format_case_id(case_info['ID'],
target=env_inst.default_dut_cls.TARGET)) target=env_inst.default_dut_cls.TARGET))
result = False result = False
unexpected_error = False
try: try:
Utility.console_log('starting running test: ' + test_func.__name__, color='green') Utility.console_log('starting running test: ' + test_func.__name__, color='green')
# execute test function # execute test function
@@ -209,6 +210,7 @@ def test_method(**kwargs):
junit_test_case.add_failure_info(str(e)) junit_test_case.add_failure_info(str(e))
except Exception as e: except Exception as e:
Utility.handle_unexpected_exception(junit_test_case, e) Utility.handle_unexpected_exception(junit_test_case, e)
unexpected_error = True
finally: finally:
# do close all DUTs, if result is False then print DUT debug info # do close all DUTs, if result is False then print DUT debug info
close_errors = env_inst.close(dut_debug=(not result)) close_errors = env_inst.close(dut_debug=(not result))
@@ -222,7 +224,7 @@ def test_method(**kwargs):
for error in close_errors: for error in close_errors:
junit_test_case.add_failure_info(str(error)) junit_test_case.add_failure_info(str(error))
result = False 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) JunitReport.test_case_finish(junit_test_case)
# end case and output result # end case and output result