This increases the default reboot timeout from ten minutes to thirty
minutes, to better handle the case where an fsck is run on reboot.
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@860 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index be3861d..26b7e77 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -21,6 +21,8 @@
import types, os, sys, signal, subprocess, time, re, socket
import base_classes, utils, errors, bootloader
+DEFAULT_REBOOT_TIMEOUT = 1800
+
class SSHHost(base_classes.RemoteHost):
"""
@@ -194,7 +196,7 @@
print "Reboot complete"
- def hardreset(self, timeout=600, wait=True):
+ def hardreset(self, timeout=DEFAULT_REBOOT_TIMEOUT, wait=True):
"""
Reach out and slap the box in the power switch
"""
@@ -319,7 +321,8 @@
return result
- def reboot(self, timeout=600, label=None, kernel_args=None, wait=True):
+ def reboot(self, timeout=DEFAULT_REBOOT_TIMEOUT, label=None,
+ kernel_args=None, wait=True):
"""
Reboot the remote host.