Add the ServerAliveInterval parameter to SSHHost to reduce the chances
that a remote host crash will hang ssh (which hangs Autotest).
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1347 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index 54c93c6..4e879ed 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -276,7 +276,8 @@
def ssh_base_command(self, connect_timeout=30):
SSH_BASE_COMMAND = '/usr/bin/ssh -a -x -o ' + \
- 'BatchMode=yes -o ConnectTimeout=%d'
+ 'BatchMode=yes -o ConnectTimeout=%d ' + \
+ '-o ServerAliveInterval=300'
assert isinstance(connect_timeout, (int, long))
assert connect_timeout > 0 # can't disable the timeout
return SSH_BASE_COMMAND % connect_timeout