Merged ConmuxSSHHost with SSHHost. If the remote machine has a serial
console you can now use SSHHost to hard reset the machine and to log
console output to a file. The class still works file when using a
machine without a serial console, with the caveat that hard reset and
console logging will fail silently.
The change also fixes a couple of issues with the original ConmuxSSHHost
implementation, specifically:
- it properly terminates all the console logging subprocesses
- hardreset can wait for the machine to come back up
From: jadmanski@google.com
git-svn-id: http://test.kernel.org/svn/autotest/trunk@811 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/guest.py b/server/hosts/guest.py
index f75e90b..0d8270c 100644
--- a/server/hosts/guest.py
+++ b/server/hosts/guest.py
@@ -60,7 +60,7 @@
self.controlling_hypervisor.delete_guest(self.hostname)
- def hardreset(self):
+ def hardreset(self, timeout=600, wait=True):
"""
Perform a "hardreset" of the guest.
@@ -68,4 +68,3 @@
even if the guest otherwise innaccessible through ssh.
"""
return self.controlling_hypervisor.reset_guest(self.hostname)
-