Revert "Enable Alpine portability test to run under Python 3. (#27464)" (#27485)

This reverts commit 54d4e8f68b.
reviewable/pr27495/r1
Jan Tattermusch 3 years ago committed by GitHub
parent 5690ea0106
commit c1bf4e1a2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      tools/run_tests/python_utils/jobset.py
  2. 2
      tools/run_tests/python_utils/upload_test_results.py

@ -130,7 +130,7 @@ def message(tag, msg, explanatory_text=None, do_newline=False):
try: try:
if platform_string() == 'windows' or not sys.stdout.isatty(): if platform_string() == 'windows' or not sys.stdout.isatty():
if explanatory_text: if explanatory_text:
logging.info(explanatory_text) logging.info(explanatory_text.decode('utf8'))
logging.info('%s: %s', tag, msg) logging.info('%s: %s', tag, msg)
else: else:
sys.stdout.write( sys.stdout.write(
@ -240,7 +240,7 @@ class JobResult(object):
def read_from_start(f): def read_from_start(f):
f.seek(0) f.seek(0)
return f.read().decode("utf8") return f.read()
class Job(object): class Job(object):

@ -88,7 +88,7 @@ def _get_build_metadata(test_results):
def _insert_rows_with_retries(bq, bq_table, bq_rows): def _insert_rows_with_retries(bq, bq_table, bq_rows):
"""Insert rows to bq table. Retry on error.""" """Insert rows to bq table. Retry on error."""
# BigQuery sometimes fails with large uploads, so batch 1,000 rows at a time. # 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 max_retries = 3
for attempt in range(max_retries): for attempt in range(max_retries):
if big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID, if big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET_ID,

Loading…
Cancel
Save