natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yapf format code

This commit is contained in:
Jan Tattermusch 2019-09-11 04:56:10 -04:00
parent 5207c148ff
commit f268db6f33
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/run_tests/python_utils/report_utils.py
View File

@ -54,18 +54,22 @@ def render_junit_xml_report(resultset,
"""Generate JUnit-like XML report.""" """Generate JUnit-like XML report."""
if not multi_target: if not multi_target:
tree = new_junit_xml_tree() tree = new_junit_xml_tree()
append_junit_xml_results(tree, resultset, suite_package, suite_name, '1', append_junit_xml_results(tree, resultset, suite_package, suite_name,
replace_dots) '1', replace_dots)
create_xml_report_file(tree, report_file) create_xml_report_file(tree, report_file)
else: else:
# To have each test result displayed as a separate target by the Resultstore/Sponge UI, # To have each test result displayed as a separate target by the Resultstore/Sponge UI,
# we generate a separate XML report file for each test result # we generate a separate XML report file for each test result
for shortname, results in six.iteritems(resultset): for shortname, results in six.iteritems(resultset):
one_result = { shortname: results } one_result = {shortname: results}
tree = new_junit_xml_tree() tree = new_junit_xml_tree()
append_junit_xml_results(tree, one_result, '%s_%s' % (suite_package, shortname), '%s_%s' % (suite_name, shortname), '1', append_junit_xml_results(tree, one_result, '%s_%s' % (suite_package,
replace_dots) shortname),
per_suite_report_file = os.path.join(os.path.dirname(report_file), shortname, os.path.basename(report_file)) '%s_%s' % (suite_name,
shortname), '1', replace_dots)
per_suite_report_file = os.path.join(
os.path.dirname(report_file), shortname,
os.path.basename(report_file))
create_xml_report_file(tree, per_suite_report_file) create_xml_report_file(tree, per_suite_report_file)

8
tools/run_tests/run_tests.py
View File

@ -1477,8 +1477,7 @@ argp.add_argument(
default=False, default=False,
const=True, const=True,
action='store_const', action='store_const',
help= help='Generate separate XML report for each test job (Looks better in UIs).'
'Generate separate XML report for each test job (Looks better in UIs).'
) )
argp.add_argument( argp.add_argument(
'--quiet_success', '--quiet_success',
@ -1888,7 +1887,10 @@ def _build_and_run(check_cancelled,
upload_extra_fields) upload_extra_fields)
if xml_report and resultset: if xml_report and resultset:
report_utils.render_junit_xml_report( report_utils.render_junit_xml_report(
resultset, xml_report, suite_name=args.report_suite_name, multi_target=args.report_multi_target) resultset,
xml_report,
suite_name=args.report_suite_name,
multi_target=args.report_multi_target)
number_failures, _ = jobset.run( number_failures, _ = jobset.run(
post_tests_steps, post_tests_steps,

13
tools/run_tests/run_tests_matrix.py
View File

@ -48,6 +48,7 @@ _DEFAULT_INNER_JOBS = 2
# the per-test breakdown items that start with 'run_tests/' (it is more readable that way) # the per-test breakdown items that start with 'run_tests/' (it is more readable that way)
_MATRIX_REPORT_NAME = 'toplevel_run_tests_invocations' _MATRIX_REPORT_NAME = 'toplevel_run_tests_invocations'
def _safe_report_name(name): def _safe_report_name(name):
"""Reports with '+' in target name won't show correctly in ResultStore""" """Reports with '+' in target name won't show correctly in ResultStore"""
return name.replace('+', 'p') return name.replace('+', 'p')
@ -65,7 +66,8 @@ def _matrix_job_logfilename(shortname_for_multi_target):
# for the corresponding 'sponge_log.xml' report. # for the corresponding 'sponge_log.xml' report.
# the shortname_for_multi_target component must be set to match the sponge_log.xml location # the shortname_for_multi_target component must be set to match the sponge_log.xml location
# because the top-level render_junit_xml_report is called with multi_target=True # because the top-level render_junit_xml_report is called with multi_target=True
s = '%s/%s/%s' % (_MATRIX_REPORT_NAME, shortname_for_multi_target, 'sponge_log.log') s = '%s/%s/%s' % (_MATRIX_REPORT_NAME, shortname_for_multi_target,
'sponge_log.log')
print(s) print(s)
return s return s
@ -203,7 +205,8 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['linux', 'macos', 'windows'], platforms=['linux', 'macos', 'windows'],
labels=['basictests', 'corelang'], labels=['basictests', 'corelang'],
extra_args=extra_args, # don't use multi_target report because C has too many test cases extra_args=
extra_args, # don't use multi_target report because C has too many test cases
inner_jobs=inner_jobs, inner_jobs=inner_jobs,
timeout_seconds=_CPP_RUNTESTS_TIMEOUT) timeout_seconds=_CPP_RUNTESTS_TIMEOUT)
@ -241,7 +244,8 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
configs=['dbg', 'opt'], configs=['dbg', 'opt'],
platforms=['linux', 'macos'], platforms=['linux', 'macos'],
labels=['basictests', 'corelang'], labels=['basictests', 'corelang'],
extra_args=extra_args, # don't use multi_target report because C++ has too many test cases extra_args=
extra_args, # don't use multi_target report because C++ has too many test cases
inner_jobs=inner_jobs, inner_jobs=inner_jobs,
timeout_seconds=_CPP_RUNTESTS_TIMEOUT) timeout_seconds=_CPP_RUNTESTS_TIMEOUT)
@ -615,7 +619,8 @@ if __name__ == "__main__":
report_utils.render_junit_xml_report( report_utils.render_junit_xml_report(
resultset, resultset,
_report_filename(_MATRIX_REPORT_NAME), _report_filename(_MATRIX_REPORT_NAME),
suite_name=_MATRIX_REPORT_NAME, multi_target=True) suite_name=_MATRIX_REPORT_NAME,
multi_target=True)
if num_failures == 0: if num_failures == 0:
jobset.message( jobset.message(