[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 166: increase boot timeout for android to 900, a few other random boot related fixes

Message ID 20111121230812.915.91067.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Paul Larson Nov. 21, 2011, 11:08 p.m.
------------------------------------------------------------
revno: 166
committer: Paul Larson <paul.larson@canonical.com>
branch nick: lava-dispatcher
timestamp: Mon 2011-11-21 17:06:03 -0600
message:
  increase boot timeout for android to 900, a few other random boot related fixes
modified:
  lava_dispatcher/client.py
  lava_dispatcher/connection.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription

Patch

=== modified file 'lava_dispatcher/client.py'
--- lava_dispatcher/client.py	2011-11-16 04:54:54 +0000
+++ lava_dispatcher/client.py	2011-11-21 23:06:03 +0000
@@ -119,7 +119,7 @@ 
         self.proc.soft_reboot()
         try:
             self.proc.expect("Starting kernel")
-            self.in_master_shell(120)
+            self.in_master_shell(300)
         except:
             logging.exception("in_master_shell failed")
             self.proc.hard_reboot()
@@ -233,7 +233,7 @@ 
     def boot_linaro_android_image(self):
         """Reboot the system to the test android image."""
         self.proc._boot(string_to_list(self.config.get('boot_cmds_android')))
-        self.in_test_shell()
+        self.in_test_shell(timeout=900)
         self.proc.sendline("export PS1=\"root@linaro: \"")
 
         self.enable_adb_over_tcpip()

=== modified file 'lava_dispatcher/connection.py'
--- lava_dispatcher/connection.py	2011-11-18 03:09:38 +0000
+++ lava_dispatcher/connection.py	2011-11-21 23:06:03 +0000
@@ -68,8 +68,9 @@ 
         # set soft reboot timeout 120s, or do a hard reset
         logging.info("Rebooting the system")
         id = self.proc.expect(
-            ['Restarting system.', pexpect.TIMEOUT], timeout=120)
-        if id != 0:
+            ['Restarting system.', 'The system is going down for reboot NOW',
+                pexpect.TIMEOUT], timeout=120)
+        if id not in [0,1]:
             self.hard_reboot()
 
     def hard_reboot(self):