servo_LabstationVerification: update for current usage
This changes updates the test-suite to properly identify with the suite
that's running. It also adapts to the servo_host logic that handles
start/stop of servod job itself.
BUG=None
TEST=manual test on desk
Change-Id: I81b710d1a7912bd4b811227f83463832e62a1a94
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2016082
Tested-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Reviewed-by: Garry Wang <xianuowang@chromium.org>
Commit-Queue: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
diff --git a/server/site_tests/servo_LabControlVerification/ccd_cr50_control_sequence.txt b/server/site_tests/servo_LabControlVerification/ccd_cr50_control_sequence.txt
index a5d356d..c9dc0ca 100644
--- a/server/site_tests/servo_LabControlVerification/ccd_cr50_control_sequence.txt
+++ b/server/site_tests/servo_LabControlVerification/ccd_cr50_control_sequence.txt
@@ -1 +1,2 @@
pwr_button_hold:1
+cr50_reboot
diff --git a/server/site_tests/servo_LabControlVerification/control_sequence.txt b/server/site_tests/servo_LabControlVerification/control_sequence.txt
index 03c4184..01c9f75 100644
--- a/server/site_tests/servo_LabControlVerification/control_sequence.txt
+++ b/server/site_tests/servo_LabControlVerification/control_sequence.txt
@@ -4,7 +4,5 @@
power_state:off
power_state:on
cold_reset
-uart4_on_flex_en
ec3po_ec_console
ctrl_d:tab
-cr50_reboot
diff --git a/server/site_tests/servo_LabControlVerification/servo_micro_control_sequence.txt b/server/site_tests/servo_LabControlVerification/servo_micro_control_sequence.txt
index 658eb54..83d3ef0 100644
--- a/server/site_tests/servo_LabControlVerification/servo_micro_control_sequence.txt
+++ b/server/site_tests/servo_LabControlVerification/servo_micro_control_sequence.txt
@@ -1,2 +1,4 @@
pwr_button:press
pwr_button:release
+uart4_on_flex_en
+cr50_reboot
diff --git a/server/site_tests/servo_LabstationVerification/control b/server/site_tests/servo_LabstationVerification/control
index df7f867..622fe13 100644
--- a/server/site_tests/servo_LabstationVerification/control
+++ b/server/site_tests/servo_LabstationVerification/control
@@ -7,6 +7,7 @@
AUTHOR = "Chrome OS Team"
NAME = "servo_LabstationVerification"
PURPOSE = "Ensure labstation images can provide basic lab functionality."
+ATTRIBUTES = "suite:labstation_verification"
TIME = "MEDIUM"
TEST_CATEGORY = "Benchmark"
TEST_CLASS = "platform"
diff --git a/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py b/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py
index 54b597e..8d751b2 100644
--- a/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py
+++ b/server/site_tests/servo_LabstationVerification/servo_LabstationVerification.py
@@ -244,7 +244,7 @@
# Then, restart servod ourselves.
host.run_background('start servod BOARD=nami PORT=9999')
# Give servod plenty of time to come up.
- time.sleep(20)
+ time.sleep(40)
try:
host.run_grep('servodutil show -p 9999',
stdout_err_regexp='No servod scratch entry found.')
@@ -277,11 +277,11 @@
# Servod came up successfully - build a servo host and use it to verify
# basic functionality.
servo_args = {servo_host.SERVO_HOST_ATTR: self.labstation_host.hostname,
- servo_host.SERVO_PORT_ATTR: 9999}
+ servo_host.SERVO_PORT_ATTR: 9999,
+ 'is_in_lab': False}
# Close out this host as the test will restart it as a servo host.
self.labstation_host.close()
- self.labstation_host = servo_host.ServoHost(is_in_lab=False,
- **servo_args)
+ self.labstation_host = servo_host.create_servo_host(None, servo_args)
self.labstation_host.connect_servo()
servo_proxy = self.labstation_host.get_servo()
if not self.dut_ip: