build/android/pylib/device/adb_wrapper.py - Issue 636273004: Make TimeoutRetryThread's stoppable

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/adb_wrapper.py

Issue 636273004: Make TimeoutRetryThread's stoppable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: some fixes, tests ready Created 6 years, 2 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:

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

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

index f6ac660c276176c5bd75ded89fac57f63cf70243..1058ce82ae28eef46bb55a6825df9b321706a279 100644

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

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

@@ -52,7 +52,7 @@ class AdbWrapper(object):

exit_code, output = cmd_helper.GetCmdStatusAndOutput(cmd)

if exit_code != 0:

raise device_errors.AdbCommandFailedError(

- cmd, 'returned non-zero exit code %s, output: %s' %

+ cmd, 'returned non-zero exit code %d and output %r' %

(exit_code, output))

# This catches some errors, including when the device drops offline;

# unfortunately adb is very inconsistent with error reporting so many