Skip to content

Commit a4f62b5

Browse files
authored
Update log statements for Android Cuttlefish cloud debugging (#3629)
1 parent f0ec668 commit a4f62b5

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/clusterfuzz/_internal/platforms/android/adb.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ def stop_cuttlefish_device():
439439
cvd_dir = environment.get_value('CVD_DIR')
440440
cvd_bin_dir = os.path.join(cvd_dir, 'bin')
441441
stop_cvd_cmd = os.path.join(cvd_bin_dir, 'stop_cvd')
442-
logs.log('stop_cvd_cmd: %', str(stop_cvd_cmd))
442+
logs.log('stop_cvd_cmd: %s' % str(stop_cvd_cmd))
443443

444444
execute_command(
445445
stop_cvd_cmd, timeout=RECOVERY_CMD_TIMEOUT, on_cuttlefish_host=True)
@@ -459,7 +459,7 @@ def recreate_cuttlefish_device():
459459
"""Recreate cuttlefish device, restoring from backup images."""
460460
logs.log('Reimaging cuttlefish device.')
461461
cvd_dir = environment.get_value('CVD_DIR')
462-
logs.log('cvd_dir: %', cvd_dir)
462+
logs.log('cvd_dir: %s' % str(cvd_dir))
463463

464464
stop_cuttlefish_device()
465465

src/clusterfuzz/_internal/platforms/android/fetch_artifact.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ def download_artifact(client, bid, target, attempt_id, name, output_directory,
5050
output_filename):
5151
"""Download one artifact."""
5252
logs.log('reached download_artifact')
53-
logs.log('artifact to download: %', name)
54-
logs.log('output_directory: %', output_directory)
55-
logs.log('output_filename: %', output_filename)
53+
logs.log('artifact to download: %s' % name)
54+
logs.log('output_directory: %s' % output_directory)
55+
logs.log('output_filename: %s' % output_filename)
5656
artifact_query = client.buildartifact().get(
5757
buildId=bid, target=target, attemptId=attempt_id, resourceId=name)
5858
artifact = execute_request_with_retries(artifact_query)
@@ -86,7 +86,7 @@ def download_artifact(client, bid, target, attempt_id, name, output_directory,
8686

8787
logs.log('Downloading artifact %s.' % name)
8888
output_dir = os.path.dirname(output_path)
89-
logs.log('Output dir: %', output_dir)
89+
logs.log('Output dir: %s' % output_dir)
9090
if not os.path.exists(output_dir):
9191
logs.log(f'Creating directory {output_dir}')
9292
os.mkdir(output_dir)

src/clusterfuzz/_internal/platforms/android/flash.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ def flash_to_latest_build_if_needed():
149149
return
150150

151151
image_directory = environment.get_value('IMAGES_DIR')
152-
logs.log('image_directory: %', image_directory)
152+
logs.log('image_directory: %s' % str(image_directory))
153153
if not image_directory:
154154
logs.log('no image_directory set, setting to default')
155155
image_directory = FLASH_DEFAULT_IMAGES_DIR
156-
logs.log('image_directory: %', image_directory)
156+
logs.log('image_directory: %s' % image_directory)
157157
build_info = fetch_artifact.get_latest_artifact_info(branch, target)
158158
if not build_info:
159159
logs.log_error('Unable to fetch information on latest build artifact for '

0 commit comments

Comments
 (0)