build/android/pylib/android_commands.py - Issue 12035016: Android: fixes timeout for WaitForLogMatch.

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

Issue 12035016: Android: fixes timeout for WaitForLogMatch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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/android_commands.py

diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py

index b8b407333f9a9269d019393abbe9f33758494951..a820d2dd9893ede980fc0da3b15c81e7483ce6dc 100644

--- a/build/android/pylib/android_commands.py

+++ b/build/android/pylib/android_commands.py

@@ -840,7 +840,7 @@ class AndroidCommands(object):

while True:

# Note this will block for upto the timeout _per log line_, so we need

# to calculate the overall timeout remaining since t0.

- time_remaining = t0 + self._logcat.timeout - time.time()

+ time_remaining = t0 + timeout - time.time()

if time_remaining < 0: raise pexpect.TIMEOUT(self._logcat)

self._logcat.expect(PEXPECT_LINE_RE, timeout=time_remaining)

line = self._logcat.match.group(1)

« no previous file with comments | « no previous file | no next file » | no next file with comments »