bypass broken screen after attempting to bypass insert screen
This patch integrates broken screen bypass code with insert screen bypass
code.
It means we first attempt to bypass the insert screen and waits for a
ping connection. If the dut is running on old firmware, it should boot and
respond to ping. If it doesn't, it implies the dut is running on the new
firmware and stuck at the broken screen. Then, we take the broken screen
bypass action.
This is needed for the boards which have to run on both tot firmware and
branched firmware.
BUG=chromium:501060,chrome-os-partner:46752
BRANCH=tot
TEST=test_that -b veyron_jerry suite:faft_bios
Change-Id: I5bccb57ace1511f49522849c5ab8c1a3cf99d54d
Signed-off-by: Daisuke Nojiri <[email protected]>
Reviewed-on: https://chromium-review.googlesource.com/309558
Reviewed-by: Wai-Hong Tam <[email protected]>
diff --git a/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py b/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py
index dcb3451..a78c4db 100644
--- a/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py
+++ b/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py
@@ -86,8 +86,7 @@
self.setup_usbkey(usbkey=False)
def run_once(self):
- if (self.faft_config.fw_bypasser_type != 'ctrl_d_bypasser' and
- self.faft_config.fw_bypasser_type != 'broken_screen_bypasser'):
+ if self.faft_config.fw_bypasser_type != 'ctrl_d_bypasser':
raise error.TestNAError("This test is only valid on devices with "
"screens.")
