From 54d4e8f68b85fffefe6849a3924b7c4bf8b3cf4c Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Fri, 24 Sep 2021 10:12:19 -0700 Subject: [PATCH] Enable Alpine portability test to run under Python 3. (#27464) * Enable Alpine portability test to run under Python 3. * Fix other scripts --- tools/run_tests/python_utils/jobset.py | 4 ++-- tools/run_tests/python_utils/upload_test_results.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py index a8bbf656ccc..1c3b7a05f02 100755 --- a/tools/run_tests/python_utils/jobset.py +++ b/tools/run_tests/python_utils/jobset.py @@ -130,7 +130,7 @@ def message(tag, msg, explanatory_text=None, do_newline=False): try: if platform_string() == 'windows' or not sys.stdout.isatty(): if explanatory_text: - logging.info(explanatory_text.decode('utf8')) + logging.info(explanatory_text) logging.info('%s: %s', tag, msg) else: sys.stdout.write( @@ -240,7 +240,7 @@ class JobResult(object): def read_from_start(f): f.seek(0) - return f.read() + return f.read().decode("utf8") class Job(object): diff --git a/tools/run_tests/python_utils/upload_test_results.py b/tools/run_tests/python_utils/upload_test_results.py index e3a63a35b6d..615c94b6d81 100644 --- a/tools/run_tests/python_utils/upload_test_results.py +++ b/tools/run_tests/python_utils/upload_test_results.py @@ -88,7 +88,7 @@ def _get_build_metadata(test_results): def _insert_rows_with_retries(bq, bq_table, bq_rows): """Insert rows to bq table. Retry on error.""" # BigQuery sometimes fails with large uploads, so batch 1,000 rows at a time. - for i in range((len(bq_rows) / 1000) + 1): + for i in range((len(bq_rows) // 1000) + 1): max_retries = 3 for attempt in range(max_retries): if big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID,