aboutsummaryrefslogtreecommitdiff
path: root/lava_dispatcher/connection.py
diff options
context:
space:
mode:
Diffstat (limited to 'lava_dispatcher/connection.py')
-rw-r--r--lava_dispatcher/connection.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lava_dispatcher/connection.py b/lava_dispatcher/connection.py
index 749a61c41..be92f1502 100644
--- a/lava_dispatcher/connection.py
+++ b/lava_dispatcher/connection.py
@@ -66,6 +66,7 @@ class LavaConnection(object):
def soft_reboot(self):
self.proc.sendline("reboot")
# set soft reboot timeout 120s, or do a hard reset
+ logging.info("Rebooting the system")
id = self.proc.expect(
['Will now restart', pexpect.TIMEOUT], timeout=120)
if id != 0:
@@ -79,12 +80,13 @@ class LavaConmuxConnection(LavaConnection):
def _make_connection(self, sio):
cmd = "conmux-console %s" % self.device_option("hostname")
- proc = pexpect.spawn(cmd, timeout=3600, logfile=sio)
+ proc = pexpect.spawn(cmd, timeout=1200, logfile=sio)
#serial can be slow, races do funny things if you don't increase delay
proc.delaybeforesend=1
return proc
def hard_reboot(self):
+ logging.info("Perform hard reset on the system")
self.proc.send("~$")
self.proc.sendline("hardreset")
# XXX Workaround for snowball