linaro-release team mailing list archive

[Spring Zhang <spring.zhang@xxxxxxxxxx>]

Spring Zhang has proposed merging lp:~qzhang/lava-dispatcher/fix-833181 into lp:lava-dispatcher.

Requested reviews:
  Linaro Validation Team (linaro-validation)
Related bugs:
  Bug #833181 in LAVA Dispatcher: "soft reboot timeout is too long"
  https://bugs.launchpad.net/lava-dispatcher/+bug/833181

For more details, see:
https://code.launchpad.net/~qzhang/lava-dispatcher/fix-833181/+merge/74121

fix bug 833181, use the soft reboot string "Will now restart", and wait 60 seconds.
-- 
https://code.launchpad.net/~qzhang/lava-dispatcher/fix-833181/+merge/74121
Your team Linaro Validation Team is requested to review the proposed merge of lp:~qzhang/lava-dispatcher/fix-833181 into lp:lava-dispatcher.

=== modified file 'lava_dispatcher/client.py'
--- lava_dispatcher/client.py	2011-08-31 07:49:52 +0000
+++ lava_dispatcher/client.py	2011-09-05 17:04:24 +0000
@@ -99,6 +99,10 @@
 
     def soft_reboot(self):
         self.proc.sendline("reboot")
+        # set soft reboot timeout 60s, or do a hard reset
+        id = self.proc.expect(['Will now restart', pexpect.TIMEOUT], timeout=60)
+        if id != 0:
+            self.hard_reboot()
 
     def hard_reboot(self):
         self.proc.send("~$")