Add a new exception for installation failures.
Change wait_for_restart to be public function.
Signed-off-by: Jean-Marc Eurin <jmeurin@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1110 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index 70f1255..1b99a3c 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -192,7 +192,7 @@
pass
- def _wait_for_restart(self, timeout):
+ def wait_for_restart(self, timeout=DEFAULT_REBOOT_TIMEOUT):
if not self.wait_down(300): # Make sure he's dead, Jim
self.__record("ABORT", None, "reboot.verify", "shutdown failed")
raise AutoservRebootError("Host did not shut down")
@@ -215,7 +215,7 @@
self.__record("ABORT", None, "reboot.start", "hard reset unavailable")
raise AutoservUnsupportedError
if wait:
- self._wait_for_restart(timeout)
+ self.wait_for_restart(timeout)
def __conmux_hostname(self):
@@ -393,7 +393,7 @@
"reboot command failed")
raise
if wait:
- self._wait_for_restart(timeout)
+ self.wait_for_restart(timeout)
self.__load_netconsole_module() # if the builtin fails