commit 37ae79bdc6244e6d802139b6581641a10ec3f2d5
author Prathmesh Prabhu <pprabhu@chromium.org> Wed Sep 12 10:37:44 2018 -0700
committer Prathmesh Prabhu <pprabhu@chromium.org> Wed Sep 12 17:58:34 2018 +0000
tree c2678d16baa03768870c05e71e9ce3a7ec43ce46
parent 5db8f8b5fddeb0c2159c68fd18b6330fffefe7fb

autotest: Really fix servo detection code

BUG=chromium:881865
TEST=python
> import common
> from autotest_lib.server import hosts
> from server import site_utils as server_utils
> from autotest_lib.server.hosts import host_info
> h = hosts.create_host(machine={
          'hostname': 'chromeos1-row2-rack1-host1.cros',
          'afe_host': server_utils.EmptyAFEHost(),
          'host_info_store': host_info.InMemoryHostInfoStore(),
  })
...
> from autotest_lib.server.hosts import base_label
> from autotest_lib.server.hosts import cros_label
> lr = base_label.LabelRetriever(cros_label.CROS_LABELS)
> lr.get_labels(h)
...
[.... 'servo' ....]

The final list contains servo.

Change-Id: I7860c545240b0bcc8a0dde95f2c44adef511fbe9
Reviewed-on: https://chromium-review.googlesource.com/1222247
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>

server/hosts/cros_label.py

diff --git a/server/hosts/cros_label.py b/server/hosts/cros_label.py
index 9dbee5b..bdd1b0a 100644
--- a/server/hosts/cros_label.py
+++ b/server/hosts/cros_label.py
@@ -406,7 +406,7 @@
         @returns True if a servo host is detected, False otherwise.
         """
         servo_host_hostname = None
-        servo_args, _ = servo_host.get_servo_args_for_host(host)
+        servo_args = servo_host.get_servo_args_for_host(host)
         if servo_args:
             servo_host_hostname = servo_args.get(servo_host.SERVO_HOST_ATTR)
         return (servo_host_hostname is not None