server/hosts/serial.py - Issue 6246035: Merge remote branch 'cros/upstream' into master

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: server/hosts/serial.py

Issue 6246035: Merge remote branch 'cros/upstream' into master (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 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: server/hosts/serial.py

diff --git a/server/hosts/serial.py b/server/hosts/serial.py

index d514dba33205d7671e8aa45c5c992f0f7ffdc535..d363cb7337f7075e9bac89d8357ce2921fe8da01 100644

--- a/server/hosts/serial.py

+++ b/server/hosts/serial.py

@@ -165,6 +165,7 @@ class SerialHost(SiteHost):

# Run on num_attempts=1 or last retry

try:

self.wait_for_restart(timeout,

+ old_boot_id=old_boot_id,

**wait_for_restart_kwargs)

except error.AutoservShutdownError:

logging.warning(warning_msg, num_attempts, num_attempts)

« cli/job.py ('K') | « server/hosts/remote.py ('k') | server/prebuild.py » ('j') | no next file with comments »