[autotest] Make servo label detection more robust.
BUG=chromium:655285
TEST=None
Change-Id: Ia53afbc1dfb3b5f7fb8ba27df97a714e25541f51
Reviewed-on: https://chromium-review.googlesource.com/517322
Commit-Ready: Kevin Cheng <kevcheng@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Kevin Cheng <kevcheng@chromium.org>
diff --git a/server/hosts/cros_label.py b/server/hosts/cros_label.py
index 22ec33b..c7a85df 100644
--- a/server/hosts/cros_label.py
+++ b/server/hosts/cros_label.py
@@ -334,8 +334,10 @@
@returns True if a servo host is detected, False otherwise.
"""
+ servo_host_hostname = None
servo_args, _ = servo_host._get_standard_servo_args(host)
- servo_host_hostname = servo_args.get(servo_host.SERVO_HOST_ATTR)
+ if servo_args:
+ servo_host_hostname = servo_args.get(servo_host.SERVO_HOST_ATTR)
return (servo_host_hostname is not None
and servo_host.servo_host_is_up(servo_host_hostname))
