commit 31767f7114953fe07981b9b334bc897639b8810a
author Garry Wang <xianuowang@chromium.org> Thu Oct 08 21:06:04 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Oct 20 00:25:04 2020 +0000
tree 7b2f90eb17a47c10cca7f474ccad49490196fc3a
parent 6e30e362ffa897d22843a50adced4f89f19d83ab

servo_LabstationVerification: Always start servod with dual_v4=1

BUG=b:170267557
TEST=None

Change-Id: Id830ba023f863c693745f95b30cf32c58dddc82f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2462873
Tested-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Commit-Queue: Garry Wang <xianuowang@chromium.org>

server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py

diff --git a/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py b/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py
index e2a3495..057088d 100644
--- a/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py
+++ b/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py
@@ -330,11 +330,14 @@
             port = dut.get('servo_port')
             serial = dut.get('servo_serial')
             servo_args = {
-                servo_constants.SERVO_HOST_ATTR: self.labstation_host.hostname,
-                servo_constants.SERVO_PORT_ATTR: port,
-                servo_constants.SERVO_SERIAL_ATTR: serial,
-                servo_constants.SERVO_BOARD_ATTR: board,
-                'is_in_lab': False,
+                    servo_constants.SERVO_HOST_ATTR:
+                    self.labstation_host.hostname,
+                    servo_constants.SERVO_PORT_ATTR: port,
+                    servo_constants.SERVO_SERIAL_ATTR: serial,
+                    servo_constants.SERVO_BOARD_ATTR: board,
+                    servo_constants.SERVO_SETUP_ATTR:
+                    servo_constants.SERVO_SETUP_VALUE_DUAL_V4,
+                    'is_in_lab': False,
             }
 
             logging.info('Setting up servod for port %s', port)
@@ -345,7 +348,8 @@
                 servo_host.run_grep(validate_cmd,
                     stdout_err_regexp='No servod scratch entry found.')
             except error.AutoservRunError:
-                raise error.TestFail('Servod did not come up on labstation.')
+                raise error.TestFail('Servod of port %s did not come up on'
+                                     ' labstation.' % port)
 
             self.servo_hosts.append(servo_host)