commit 6a68006443fd53e925c4ac466dcbfa5ef1431d8e
author Garry Wang <xianuowang@chromium.org> Tue Nov 03 13:40:29 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Nov 04 04:50:53 2020 +0000
tree 8af7ee3cffde98666cd1be016e51a0cea58aeaf7
parent faa8bbe93ae5cd2449a1ddb897402a16ceabf31d

servo_LabstationVerification: Fix dual-setup related verify failure

Since we start servod with `DUAL_V4=1` option for all DUTs even
they don't actually have hardware dual setup, this behavior
confused topology verifier to think one of main device is missing
and resulting a verify failure. The fix is to pass `DUAL_V4` as
extra servo args instead of use official `servo_setup` attribute.

BUG=b:172023918
TEST=run servo_LabstationVerification test locally

Change-Id: I99e9c00da8223606aaf48cd61d72caad793934d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2517988
Commit-Queue: Garry Wang <xianuowang@chromium.org>
Tested-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Otabek Kasimov <otabek@google.com>

server/hosts/servo_constants.py

diff --git a/server/hosts/servo_constants.py b/server/hosts/servo_constants.py
index fbd4ba0..8c72a6b 100644
--- a/server/hosts/servo_constants.py
+++ b/server/hosts/servo_constants.py
@@ -25,6 +25,9 @@
         SERVO_SETUP_ATTR,
 )
 
+# Additional args that will be appended to servod start command.
+ADDITIONAL_SERVOD_ARGS = 'additional_servod_args'
+
 # Timeout value for stop/start servod process.
 SERVOD_TEARDOWN_TIMEOUT = 3
 SERVOD_QUICK_STARTUP_TIMEOUT = 20