build/android/pylib/device/device_errors.py - Issue 1077173002: [Android] Tune DeviceUtils commands that are prone to large outputs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/device/device_errors.py

Issue 1077173002: [Android] Tune DeviceUtils commands that are prone to large outputs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: perezju comments Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/android/pylib/device/device_errors.py

diff --git a/build/android/pylib/device/device_errors.py b/build/android/pylib/device/device_errors.py

index 66a226ca5206e590c66732192b03ce4af8a95368..e94968f146ad3256edbaa67460b79cdf410ee33f 100644

--- a/build/android/pylib/device/device_errors.py

+++ b/build/android/pylib/device/device_errors.py

@@ -59,7 +59,11 @@ class AdbShellCommandFailedError(AdbCommandFailedError):

message.append(' exit status: %s\n' % status)

if output:

message.append(' output:\n')

- message.extend(' - %s\n' % line for line in output.splitlines())

+ if isinstance(output, basestring):

+ output_lines = output.splitlines()

+ else:

+ output_lines = output

+ message.extend(' - %s\n' % line for line in output_lines)

else:

message.append(" output: ''\n")

message = ''.join(message)

« no previous file with comments | « no previous file | build/android/pylib/device/device_utils.py » ('j') | build/android/pylib/device/device_utils.py » ('J')