[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 669: Add ability for user to specify the wait_for_home_screen_activity in the job file

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

Commit Message

Tyler Baker Sept. 5, 2013, 6:09 p.m.
Merge authors:
  Tyler Baker (tyler-baker)
Related merge proposals:
  https://code.launchpad.net/~tyler-baker/lava-dispatcher/job-defined-home-screen-activity/+merge/184001
  proposed by: Tyler Baker (tyler-baker)
  review: Approve - Antonio Terceiro (terceiro)
------------------------------------------------------------
revno: 669 [merge]
committer: Tyler Baker <tyler.baker@linaro.org>
branch nick: lava-dispatcher
timestamp: Thu 2013-09-05 11:08:50 -0700
message:
  Add ability for user to specify the wait_for_home_screen_activity in the job file
modified:
  lava_dispatcher/actions/boot_control.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-08-28 14:55:50 +0000
+++ lava_dispatcher/actions/boot_control.py	2013-09-05 18:05:56 +0000
@@ -49,17 +49,24 @@ 
     parameters_schema['properties']['wait_for_home_screen'] = {
         'default': False, 'optional': True
     }
+    parameters_schema['properties']['wait_for_home_screen_activity'] = {
+        'type': 'string', 'optional': True
+    }
     parameters_schema['properties']['interactive_boot_cmds'] = {
         'default': False, 'optional': True
     }
 
     def run(self, options=[], adb_check=False,
-            wait_for_home_screen=True, interactive_boot_cmds=False):
+            wait_for_home_screen=True, wait_for_home_screen_activity=None,
+            interactive_boot_cmds=False):
         client = self.client
         if interactive_boot_cmds:
             client.config.boot_cmds = options
         else:
             client.target_device.boot_options = options
+        if wait_for_home_screen_activity is not None:
+            client.config.android_wait_for_home_screen_activity = \
+             wait_for_home_screen_activity
         client.config.android_wait_for_home_screen = wait_for_home_screen
         try:
             client.boot_linaro_android_image(