Increase the timeout used when waiting for a machine to shut down during a reboot, and raise an exception if it times out instead of proceeding as if the reboot succeeded.
From: John Admanski <jadmanski@google.com>
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@863 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index 26b7e77..2662220 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -188,7 +188,9 @@
def _wait_for_restart(self, timeout):
- self.wait_down(60) # Make sure he's dead, Jim
+ if not self.wait_down(300): # Make sure he's dead, Jim
+ sys.stderr.write("REBOOT ERROR\n")
+ raise errors.AutoservRebootError("Host would not shut down")
self.wait_up(timeout)
time.sleep(2) # this is needed for complete reliability
if not self.wait_up(timeout):