faft: Pressing Power + Esc + F3 directly boots into USB stick
In the design of keyboard controlled recovery, pressing Power + Esc + F3
directly boots into USB stick (if presented) and doesn't require users to
unplug it first.
So change the test logic for it.
BUG=chrome-os-partner:11826
TEST=Run firmware_RecoveryButton on Snow passed.
Change-Id: Id0b67b050844a51e82821da6f281bbe7ab932fa1
Reviewed-on: https://gerrit.chromium.org/gerrit/28930
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py b/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
index 2f250d9..a09703c 100644
--- a/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
+++ b/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
@@ -54,11 +54,16 @@
}),
'userspace_action': self.enable_rec_mode_and_reboot,
'reboot_action': None,
- # When dev_mode ON, directly boot to USB stick if presented.
- # When dev_mode OFF,
+ # In the keyboard controlled recovery mode design, it doesn't
+ # require users to remove and insert the USB.
+ #
+ # In the old design, it checks:
+ # if dev_mode ON, directly boot to USB stick if presented;
+ # if dev_mode OFF,
# the old models need users to remove and insert the USB;
# the new models directly boot to the USB.
- 'firmware_action': None if dev_mode or not remove_usb else
+ 'firmware_action': None if self.client_attr.keyboard_dev or
+ dev_mode or not remove_usb else
self.wait_fw_screen_and_plug_usb,
'install_deps_after_boot': True,
},
