Make things trying to do an ssh ping, use ssh_ping. Change timeout to 60s
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@982 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index ac6c5f9..7d5a15e 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -500,7 +500,7 @@
True if the remote host is up, False otherwise
"""
try:
- result= self.run("true", timeout=10)
+ self.ssh_ping()
except errors.AutoservRunError:
return False
else:
@@ -529,8 +529,7 @@
while not timeout or time.time() < end_time:
try:
- run_timeout= 10
- result= self.run("true", timeout=run_timeout)
+ self.ssh_ping()
except errors.AutoservRunError:
pass
else:
@@ -560,8 +559,7 @@
while not timeout or time.time() < end_time:
try:
- run_timeout= 10
- result= self.run("true", timeout=run_timeout)
+ self.ssh_ping()
except errors.AutoservRunError:
return True
else:
@@ -649,5 +647,5 @@
rc = utils.system(fpingcmd, ignore_status = 1)
return (rc == 0)
- def ssh_ping(self, timeout = 30):
- self.run('ls', timeout = timeout)
+ def ssh_ping(self, timeout = 60):
+ self.run('true', timeout = timeout)