autotest: Fix whirlwind host verification
Starting with build R61-7618, it takes longer for system-services
to start up on whirlwinds, causing verify.cros to fail on checking
system-services. This change ensure that ap-controller is up and
running before attempting host verification.
BUG=chromium:739583
TEST=Run on moblab.
Change-Id: Ic7ab1c3b9dfeb6537cdb5af6c718af536189674b
Reviewed-on: https://chromium-review.googlesource.com/564221
Commit-Ready: Laurence Goodby <lgoodby@chromium.org>
Tested-by: Laurence Goodby <lgoodby@chromium.org>
Reviewed-by: Suresh Rajashekara <sureshraj@chromium.org>
Reviewed-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Laurence Goodby <lgoodby@chromium.org>
diff --git a/server/hosts/jetstream_host.py b/server/hosts/jetstream_host.py
index 533fba0..ba7bee4 100644
--- a/server/hosts/jetstream_host.py
+++ b/server/hosts/jetstream_host.py
@@ -21,6 +21,9 @@
# Presence of any of these processes indicates that the host is up:
BOOT_DETECTION_PROCESSES = ('ap-controller',)
+# Maximum time for host to report is_up after rebooting
+BOOT_TIMEOUT_SECONDS = 180
+
# Maximum time for host to recover after resetting
RESET_TIMEOUT_SECONDS = 60
@@ -58,6 +61,13 @@
def get_wait_up_processes(self):
return BOOT_DETECTION_PROCESSES
+ def verify(self):
+ # Whirlwind takes longer to start all system services, so check
+ # that ap-controller is running before verifying, crbug/739583.
+ self.wait_up(timeout=BOOT_TIMEOUT_SECONDS)
+ logging.debug('Jetstream host is up, starting verification')
+ super(JetstreamHost, self).verify()
+
def cleanup_services(self):
"""Restores the host to default settings.
