From 45501dbbc4cb2efc8d06681ba8d965e7bb3d78f6 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 23 Dec 2019 12:05:26 -0800 Subject: [PATCH 1/3] Don't fail on upload_results_to_bq not being defined --- tools/run_tests/run_tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 50dbbfa184f..d3551b4c9c5 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1931,8 +1931,11 @@ def _build_and_run(check_cancelled, 0], # args.language is a list but will always have one element when uploading to BQ is enabled. 'platform': platform_string() } - upload_results_to_bq(resultset, args.bq_result_table, + try: + upload_results_to_bq(resultset, args.bq_result_table, upload_extra_fields) + except NameError: + pass # It's fine to ignore since this is not critical if xml_report and resultset: report_utils.render_junit_xml_report( resultset, From e0e6e574d15d1e521445679d07bf02a8032b4e63 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 23 Dec 2019 12:16:14 -0800 Subject: [PATCH 2/3] Reviewer comments --- tools/run_tests/run_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index d3551b4c9c5..ce39444716a 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1934,8 +1934,8 @@ def _build_and_run(check_cancelled, try: upload_results_to_bq(resultset, args.bq_result_table, upload_extra_fields) - except NameError: - pass # It's fine to ignore since this is not critical + except NameError as e: + logging.warning(e) # It's fine to ignore since this is not critical if xml_report and resultset: report_utils.render_junit_xml_report( resultset, From 72c4b9767b2d8a3d963914e86e1c2dc51076f9d6 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 23 Dec 2019 13:08:38 -0800 Subject: [PATCH 3/3] YAPF formatting --- tools/run_tests/run_tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index ce39444716a..7b1cffd25cf 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1932,10 +1932,11 @@ def _build_and_run(check_cancelled, 'platform': platform_string() } try: - upload_results_to_bq(resultset, args.bq_result_table, - upload_extra_fields) + upload_results_to_bq(resultset, args.bq_result_table, + upload_extra_fields) except NameError as e: - logging.warning(e) # It's fine to ignore since this is not critical + logging.warning( + e) # It's fine to ignore since this is not critical if xml_report and resultset: report_utils.render_junit_xml_report( resultset,