Merge lp:~le-chi-thu/lava-dispatcher/skip-home-screen-hcj into lp:lava-dispatcher

[Le Chi Thu]

skip raising exception when home screen if it is health check jobs

[Zygmunt Krynicki (zyga)]

While this looks okay I hate how we have to hard-code such details in python. This is not a constructive rant, feel free to ignore it.

review: Approve

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-05-17 21:25:09 +0000
+++ doc/changes.rst	2012-05-22 14:36:24 +0000
@@ -1,6 +1,8 @@
 Version History
 ***************
 
+* Skip raising exception on the home screen has not displayed for health check jobs
+
 .. _version_0_7_1:
 
 Version 0.7.1

=== modified file 'lava_dispatcher/client/base.py'
--- lava_dispatcher/client/base.py	2012-05-17 13:02:48 +0000
+++ lava_dispatcher/client/base.py	2012-05-22 14:36:24 +0000
@@ -350,7 +350,14 @@
             pass
         session.android_adb_connect(dev_ip)
         session.wait_until_attached()
-        session.wait_home_screen()
+        try:
+            session.wait_home_screen()
+        except:
+            # ignore home screen exception if it is a health check job.
+            if not (self.context.job_data.has_key("health_check") and self.context.job_data["health_check"] == True):
+                raise
+            else:
+                logging.info("Skip raising exception on the home screen has not displayed for health check jobs")
         try:
             yield session
         finally:
@@ -442,7 +449,15 @@
         """ disable the suspend of images. 
         this needs wait unitl the home screen displayed"""
         session = AndroidTesterCommandRunner(self)
-        session.wait_home_screen()
+        try:
+            session.wait_home_screen()
+        except:
+            # ignore home screen exception if it is a health check job.
+            if not (self.context.job_data.has_key("health_check") and self.context.job_data["health_check"] == True):
+                raise
+            else:
+                logging.info("Skip raising exception on the home screen has not displayed for health check jobs")
+
         stay_awake = "delete from system where name='stay_on_while_plugged_in'; insert into system (name, value) values ('stay_on_while_plugged_in','3');"
         screen_sleep = "delete from system where name='screen_off_timeout'; insert into system (name, value) values ('screen_off_timeout','-1');"
         lockscreen = "delete from secure where name='lockscreen.disabled'; insert into secure (name, value) values ('lockscreen.disabled','1');"