faft: Speed-up FwScreenPressPower and FwScreenCloseLid tests
This CL supports a timeout argument to confirm DUT shutdown. We limit
the shutdown check only on the dev screen internal disk boot. Since the
other scenarios, like recovery insert screen, are impossible to boot.
And we also reduce this timeout value to 60s (default 100s) which is
able to confirm DUT shutdown in the case of the internal disk boot.
This CL reduces the test runtime from 20min to 10min on Link.
BUG=chromium-os:34392
TEST=run FwScreenPressPower and FwScreenCloseLid passed on Link.
Change-Id: I4e8059e2e2ada29d3c3da52526656f2002a9823a
Reviewed-on: https://gerrit.chromium.org/gerrit/39583
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: 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 62b737e..2ebba93 100644
--- a/server/cros/faftsequence.py
+++ b/server/cros/faftsequence.py
@@ -1346,7 +1346,7 @@
def run_shutdown_process(self, shutdown_action, pre_power_action=None,
- post_power_action=None):
+ post_power_action=None, shutdown_timeout=None):
"""Run shutdown_action(), which makes DUT shutdown, and power it on.
Args:
@@ -1354,6 +1354,7 @@
power key.
pre_power_action: a function which is called before next power on.
post_power_action: a function which is called after next power on.
+ shutdown_timeout: a timeout to confirm DUT shutdown.
Raises:
error.TestFail: if the shutdown_action() failed to turn DUT off.
@@ -1361,7 +1362,9 @@
self._call_action(shutdown_action)
logging.info('Wait to ensure DUT shut down...')
try:
- self.wait_for_client()
+ if shutdown_timeout is None:
+ shutdown_timeout = self.delay.shutdown_timeout
+ self.wait_for_client(timeout=shutdown_timeout)
raise error.TestFail(
'Should shut the device down after calling %s.' %
str(shutdown_action))