eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

analyze_outcomes: escape {} in string format for test description

Browse source 
{} are valid characters in test description, but they're not escaped
properly in python string format(). To resolve the bug of KeyError
when it tries to log test description which contains {}, we replace
{XXX} format with {{XXX}} in order to escape {} in python string
format() properly.

In addition, the calls to Results.log() are also handled to avoid
similar potential problems.

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-09-26 16:19:18 +08:00
parent ffbdd33f04
commit 0e319ae577
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/scripts/analyze_outcomes.py
View file

@ -60,13 +60,13 @@ def execute_reference_driver_tests(ref_component, driver_component, outcome_file
# If the outcome file already exists, we assume that the user wants to # If the outcome file already exists, we assume that the user wants to
# perform the comparison analysis again without repeating the tests. # perform the comparison analysis again without repeating the tests.
if os.path.exists(outcome_file): if os.path.exists(outcome_file):
Results.log("Outcome file (" + outcome_file + ") already exists. " + \ Results.log("Outcome file {} already exists. Tests will be skipped.",
"Tests will be skipped.") outcome_file)
return return
shell_command = "tests/scripts/all.sh --outcome-file " + outcome_file + \ shell_command = "tests/scripts/all.sh --outcome-file " + outcome_file + \
" " + ref_component + " " + driver_component " " + ref_component + " " + driver_component
Results.log("Running: " + shell_command) Results.log("Running: {}", shell_command)
ret_val = subprocess.run(shell_command.split(), check=False).returncode ret_val = subprocess.run(shell_command.split(), check=False).returncode
if ret_val != 0: if ret_val != 0:
@ -101,6 +101,7 @@ def analyze_driver_vs_reference(outcomes, component_ref, component_driver,
""" """
available = check_test_cases.collect_available_test_cases() available = check_test_cases.collect_available_test_cases()
result = True result = True
escape_curly_brace = lambda x: x.replace('{', '{{').replace('}', '}}')
for key in available: for key in available:
# Continue if test was not executed by any component # Continue if test was not executed by any component
@ -125,7 +126,7 @@ def analyze_driver_vs_reference(outcomes, component_ref, component_driver,
if component_ref in entry: if component_ref in entry:
reference_test_passed = True reference_test_passed = True
if(reference_test_passed and not driver_test_passed): if(reference_test_passed and not driver_test_passed):
Results.log(key) Results.log(escape_curly_brace(key))
result = False result = False
return result return result
@ -172,8 +173,8 @@ def do_analyze_driver_vs_reference(outcome_file, args):
ignored_suites = ['test_suite_' + x for x in args['ignored_suites']] ignored_suites = ['test_suite_' + x for x in args['ignored_suites']]
outcomes = read_outcome_file(outcome_file) outcomes = read_outcome_file(outcome_file)
Results.log("\n*** Analyze driver {} vs reference {} ***\n".format( Results.log("\n*** Analyze driver {} vs reference {} ***\n",
args['component_driver'], args['component_ref'])) args['component_driver'], args['component_ref'])
return analyze_driver_vs_reference(outcomes, args['component_ref'], return analyze_driver_vs_reference(outcomes, args['component_ref'],
args['component_driver'], ignored_suites, args['component_driver'], ignored_suites,
args['ignored_tests']) args['ignored_tests'])
@ -652,7 +653,7 @@ def main():
for task in tasks: for task in tasks:
if task not in TASKS: if task not in TASKS:
Results.log('Error: invalid task: {}'.format(task)) Results.log('Error: invalid task: {}', task)
sys.exit(1) sys.exit(1)
TASKS['analyze_coverage']['args']['full_coverage'] = \ TASKS['analyze_coverage']['args']['full_coverage'] = \