[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 608: Add wait_for_screen option to boot_linaro_android_image

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

Commit Message

Tyler Baker May 22, 2013, 4:16 p.m.
Merge authors:
  Tyler Baker (tyler-baker)
Related merge proposals:
  https://code.launchpad.net/~tyler-baker/lava-dispatcher/override-wait-for-homescreen/+merge/164226
  proposed by: Tyler Baker (tyler-baker)
  review: Approve - Tyler Baker (tyler-baker)
------------------------------------------------------------
revno: 608 [merge]
committer: Tyler Baker <tyler.baker@linaro.org>
branch nick: lava-dispatcher-tip
timestamp: Wed 2013-05-22 09:15:22 -0700
message:
  Add wait_for_screen option to boot_linaro_android_image
modified:
  lava_dispatcher/actions/boot_control.py
  lava_dispatcher/client/base.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/actions/boot_control.py'
--- lava_dispatcher/actions/boot_control.py	2013-03-27 11:22:07 +0000
+++ lava_dispatcher/actions/boot_control.py	2013-05-22 16:09:09 +0000
@@ -46,10 +46,14 @@ 
     parameters_schema['properties']['adb_check'] = {
         'default': False, 'optional': True
     }
+    parameters_schema['properties']['wait_for_home_screen'] = {
+        'default': False, 'optional': True
+    }
 
-    def run(self, options=[], adb_check=False):
+    def run(self, options=[], adb_check=False, wait_for_home_screen=True):
         client = self.client
         client.target_device.boot_options = options
+        client.config.android_wait_for_home_screen = wait_for_home_screen
         try:
             client.boot_linaro_android_image(
                 adb_check=adb_check)

=== modified file 'lava_dispatcher/client/base.py'
--- lava_dispatcher/client/base.py	2013-05-21 07:11:59 +0000
+++ lava_dispatcher/client/base.py	2013-05-22 16:15:22 +0000
@@ -569,9 +569,10 @@ 
                 raise
             else:
                 logging.info("Skip raising exception on the home screen has not displayed for health check jobs")
-
+        # When disablesuspend executes it waits for home screen unless
+        # --no-wait is passed.
         session.run(
-            '/system/bin/disablesuspend.sh',
+            '/system/bin/disablesuspend.sh --no-wait',
             timeout=self.config.disablesuspend_timeout)
 
     def _enable_network(self):