pull/23285/head
Richard Belleville 5 years ago
parent 1010d3a619
commit 09007ebccf
  1. 21
      tools/interop_matrix/run_interop_matrix_tests.py

@ -223,9 +223,7 @@ def _test_release(lang, runtime, release, image, xml_report_tree, skip_tests):
suite_name) suite_name)
if not job_spec_list: if not job_spec_list:
jobset.message('FAILED', jobset.message('FAILED', 'No test cases were found.', do_newline=True)
'No test cases were found.',
do_newline=True)
total_num_failures += 1 total_num_failures += 1
else: else:
num_failures, resultset = jobset.run(job_spec_list, num_failures, resultset = jobset.run(job_spec_list,
@ -237,8 +235,7 @@ def _test_release(lang, runtime, release, image, xml_report_tree, skip_tests):
upload_test_results.upload_interop_results_to_bq( upload_test_results.upload_interop_results_to_bq(
resultset, args.bq_result_table) resultset, args.bq_result_table)
if skip_tests: if skip_tests:
jobset.message('FAILED', 'Tests were skipped', jobset.message('FAILED', 'Tests were skipped', do_newline=True)
do_newline=True)
total_num_failures += 1 total_num_failures += 1
if num_failures: if num_failures:
total_num_failures += num_failures total_num_failures += num_failures
@ -278,18 +275,24 @@ def _run_tests_for_lang(lang, runtime, images, xml_report_tree):
if pull_failures: if pull_failures:
jobset.message( jobset.message(
'FAILED', 'FAILED',
'Image download failed. Skipping tests for language "%s"' % lang, 'Image download failed. Skipping tests for language "%s"' %
lang,
do_newline=True) do_newline=True)
skip_tests = True skip_tests = True
for release, image in images[chunk_start:chunk_end]: for release, image in images[chunk_start:chunk_end]:
total_num_failures += _test_release(lang, runtime, release, image, xml_report_tree, skip_tests) total_num_failures += _test_release(lang, runtime, release, image,
xml_report_tree, skip_tests)
if not args.keep: if not args.keep:
for _, image in images[chunk_start:chunk_end]: for _, image in images[chunk_start:chunk_end]:
_cleanup_docker_image(image) _cleanup_docker_image(image)
if not total_num_failures: if not total_num_failures:
jobset.message('SUCCESS', 'All {} tests passed'.format(lang), do_newline=True) jobset.message('SUCCESS',
'All {} tests passed'.format(lang),
do_newline=True)
else: else:
jobset.message('FAILED', 'Some {} tests failed'.format(lang), do_newline=True) jobset.message('FAILED',
'Some {} tests failed'.format(lang),
do_newline=True)
return total_num_failures return total_num_failures

Loading…
Cancel
Save