server/crashcollect.py - Issue 6539001: 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/crashcollect.py

Issue 6539001: 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, 10 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/crashcollect.py

diff --git a/server/crashcollect.py b/server/crashcollect.py

index 1f28861dcdf60f57fd181453cb4125790eb1a758..6e1de7fdf0d21dce03f0a4923244683b1c3cf70b 100644

--- a/server/crashcollect.py

+++ b/server/crashcollect.py

@@ -46,8 +46,8 @@ def wait_for_machine_to_recover(host, hours_to_wait=4.0):

logging.info("%s already up, collecting crash info", host.hostname)

return True

- logging.info("Waiting four hours for %s to come up (%s)",

- host.hostname, current_time)

+ logging.info("Waiting %s hours for %s to come up (%s)",

+ hours_to_wait, host.hostname, current_time)

if not host.wait_up(timeout=hours_to_wait * 3600):

logging.warning("%s down, unable to collect crash info",

host.hostname)

« no previous file with comments | « frontend/frontend_unittest.py ('k') | no next file » | no next file with comments »