Don't wait_up() without a timeout in ensure_up()
From: Steven Howard <showard@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@837 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/errors.py b/server/errors.py
index 6bd2995..5fceae2 100644
--- a/server/errors.py
+++ b/server/errors.py
@@ -25,3 +25,7 @@
class AutoservVirtError(AutoservError):
"""Vitualization related error"""
pass
+
+class AutoservHostError(AutoservError):
+ """Error reaching a host"""
+ pass
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index 04dd960..1a79a62 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -519,7 +519,9 @@
if hasattr(self, 'hardreset') and not self.wait_up(300):
print "Performing a hardreset on %s" % self.hostname
self.hardreset()
- self.wait_up()
+ if not self.wait_up(60 * 30):
+ # 30 minutes should be more than enough
+ raise errors.AutoservHostError
print 'Host up, continuing'