commit fecdaf4ead5b2dba5ead0b86eb59311023527f9d
author Dan Shi <dshi@chromium.org> Tue Jul 28 10:17:26 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Jul 29 08:45:13 2015 +0000
tree 7fbfcce88a21aad24ce2e50da3093dd30dd27205
parent 5aa2504a6947eda0943689ca55ed6bd4dce8444f

[autotest] Add 10 min timeout when re-program EC/BIOS

Without the timeout, firmware provision will stuck long time before test/
special task timeout kicks in.

retry.timeout does not work with process started in code. refer to CL 288366

BUG=None
TEST=local test

Change-Id: Icefcb8841ff61a300087cb1c012f68ad96c4cb0a
Reviewed-on: https://chromium-review.googlesource.com/288974
Trybot-Ready: Dan Shi <dshi@chromium.org>
Tested-by: Dan Shi <dshi@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>
Commit-Queue: Dan Shi <dshi@chromium.org>

server/cros/servo/firmware_programmer.py

diff --git a/server/cros/servo/firmware_programmer.py b/server/cros/servo/firmware_programmer.py
index 6f79253..4d7c166 100644
--- a/server/cros/servo/firmware_programmer.py
+++ b/server/cros/servo/firmware_programmer.py
@@ -22,6 +22,9 @@
 from autotest_lib.server.cros.faft.config.config import Config as FAFTConfig
 
 
+# Number of seconds for program EC/BIOS to time out.
+FIRMWARE_PROGRAM_TIMEOUT_SEC = 600
+
 class ProgrammerError(Exception):
     """Local exception class wrapper."""
     pass
@@ -90,7 +93,8 @@
         self._set_servo_state()
         try:
             logging.debug("Programmer command: %s", self._program_cmd)
-            self._servo.system(self._program_cmd)
+            self._servo.system(self._program_cmd,
+                               timeout=FIRMWARE_PROGRAM_TIMEOUT_SEC)
         finally:
             self._restore_servo_state()
 
@@ -132,7 +136,8 @@
             for section in vpd_sections + gbb_section:
                 self._servo.system(' '.join([
                     'flashrom', '-V', '-p', programmer,
-                    '-r', self._fw_main, '-i', '%s:%s' % section]))
+                    '-r', self._fw_main, '-i', '%s:%s' % section]),
+                    timeout=FIRMWARE_PROGRAM_TIMEOUT_SEC)
 
             # Pack the saved VPD into new firmware
             self._servo.system('cp %s %s' % (self._fw_path, self._fw_main))
@@ -144,7 +149,8 @@
                     '-w', self._fw_main]
             for section in vpd_sections:
                 pack_cmd.extend(['-i', '%s:%s' % section])
-            self._servo.system(' '.join(pack_cmd))
+            self._servo.system(' '.join(pack_cmd),
+                               timeout=FIRMWARE_PROGRAM_TIMEOUT_SEC)
 
             # Read original HWID. The output format is:
             #    hardware_id: RAMBI TEST A_A 0128
@@ -159,7 +165,7 @@
             # Flash the new firmware
             self._servo.system(' '.join([
                     'flashrom', '-V', '-p', programmer,
-                    '-w', self._fw_main]))
+                    '-w', self._fw_main]), timeout=FIRMWARE_PROGRAM_TIMEOUT_SEC)
         finally:
             self._restore_servo_state()