faft: Increase the ec boot delays and reduce unnecessary waiting
To reflect the recent change which makes the EC cold reset from 0.2s to 1s:
https://gerrit.chromium.org/gerrit/#/c/39519/
The ec_boot_to_console should increase from 0.4s to 1.2s.
The ec_reboot_cmd should increase from 1s to 1.8s.
For emulating the long recovery combo, reduce the unnecessary waiting.
BUG=chrome-os-partner:16668
TEST=run DevMode and RONormalBoot tests passed on Link .133 firmware.
Change-Id: I7d28d5b1ba2c51b3ac59add35bf845fe3446d5a5
Reviewed-on: https://gerrit.chromium.org/gerrit/39533
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/cros/faftsequence.py b/server/cros/faftsequence.py
index 77b95e5..23d824d 100644
--- a/server/cros/faftsequence.py
+++ b/server/cros/faftsequence.py
@@ -964,12 +964,13 @@
if self.client_attr.chrome_ec:
# Reset twice to emulate a long recovery-key-combo hold.
cold_reset_num = 2 if self.client_attr.long_rec_combo else 1
- for _ in range(cold_reset_num):
+ for i in range(cold_reset_num):
+ if i:
+ time.sleep(self.delay.ec_boot_to_console)
# Cold reset to clear EC_IN_RW signal
self.servo.set('cold_reset', 'on')
time.sleep(self.delay.hold_cold_reset)
self.servo.set('cold_reset', 'off')
- time.sleep(self.delay.ec_boot_to_console)
self.ec.reboot("ap-off")
time.sleep(self.delay.ec_boot_to_console)
self.ec.set_hostevent(chrome_ec.HOSTEVENT_KEYBOARD_RECOVERY)