commit c47c358faa97ac7c78f6a7c1152ad9d22ee07971
author Shelley Chen <shchen@chromium.org> Wed Sep 21 11:01:16 2016 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Mon Mar 27 00:31:54 2017 +0000
tree 014b88e3084052c9cd92a8d86356ff3be64f6823
parent fd99239c0fc6b11cc0b7a485752ceb7f0456190b

faft: increase recovery delay in ECLidShutdown

Some boards (ie: Kevin) boot up slower than
others into recovery mode.  Making the test
more tolerant of these slower boards by
increasing the delay after a reboot with
faft_config.firmware_screen, which is
board-specific.

BUG=None
BRANCH=None
TEST=run ECLidShutdown on Kevin

Change-Id: Id379fd4257f53b1b930d5e90e2a06a8caab3a3d4
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/387868
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
(cherry picked from commit 8426d5d198275eccd8094d85610a516c665f304f)
Reviewed-on: https://chromium-review.googlesource.com/456891
Commit-Queue: Jongpil Jung <jongpil19.jung@samsung.corp-partner.google.com>
Tested-by: Jongpil Jung <jongpil19.jung@samsung.corp-partner.google.com>

server/site_tests/firmware_ECLidShutdown/firmware_ECLidShutdown.py

diff --git a/server/site_tests/firmware_ECLidShutdown/firmware_ECLidShutdown.py b/server/site_tests/firmware_ECLidShutdown/firmware_ECLidShutdown.py
index 24d310e..a560286 100644
--- a/server/site_tests/firmware_ECLidShutdown/firmware_ECLidShutdown.py
+++ b/server/site_tests/firmware_ECLidShutdown/firmware_ECLidShutdown.py
@@ -20,8 +20,6 @@
     LID_DELAY = 2
     # time to wait before checking if DUT booted into OS mode
     BOOTUP_TIME = 30
-    # time to wait to let DUT transition into recovery mode
-    RECOVERY_DELAY = 1
     # # times to check if DUT in expected power state
     # This accomodates if DUT needs to transition into certain states.
     PWR_RETRIES = 13
@@ -68,7 +66,7 @@
         # reboot into recovery mode and wait a bit for it to actually get there
         self.faft_client.system.request_recovery_boot()
         self.switcher.mode_aware_reboot(wait_for_dut_up=False)
-        time.sleep(self.RECOVERY_DELAY)
+        time.sleep(self.faft_config.firmware_screen)
 
         # close/open lid
         self.servo.set('lid_open', 'no')
@@ -95,7 +93,7 @@
         # reboot into recovery mode and wait a bit for it to get there
         self.faft_client.system.request_recovery_boot()
         self.switcher.mode_aware_reboot(wait_for_dut_up=False)
-        time.sleep(self.RECOVERY_DELAY)
+        time.sleep(self.faft_config.firmware_screen)
 
         # close/open the lid
         self.servo.set('lid_open', 'no')