Properly support _freon systems in suspend/resume tests.
Sandybridge systems need special handling in suspend/resume tests,
and they are identified by utils.get_board().
Now that we have *_freon names for some of these systems, support
the special handling by removing "_freon" from the board name.
The whitelists in sys_power.py are ok because we use them with
re.search() which still makes the appropriate match in freon systems.
But the _SUSPEND_DELAY dictionary in power_suspend.py requires an
exact match on the key.
BUG=chromium:489949
TEST=power_Resume on lumpy_freon, verify the 5 second suspend is used.
Change-Id: I181a014d5ab330ef8c527870a1e2fb8e449dcfa6
Reviewed-on: https://chromium-review.googlesource.com/277056
Trybot-Ready: Bryan Freed <bfreed@chromium.org>
Tested-by: Bryan Freed <bfreed@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Bryan Freed <bfreed@chromium.org>
Commit-Queue: Bryan Freed <bfreed@chromium.org>
diff --git a/client/cros/power_suspend.py b/client/cros/power_suspend.py
index 6da1649..57f2cd3 100644
--- a/client/cros/power_suspend.py
+++ b/client/cros/power_suspend.py
@@ -148,6 +148,11 @@
logging.info('Device resume times set to %s', bool(on))
+ def _get_board(self):
+ """Remove _freon from get_board if found."""
+ return (utils.get_board().replace("_freon", ""))
+
+
def _reset_logs(self):
"""Throw away cached log lines and reset log pointer to current end."""
if self._log_file:
@@ -234,7 +239,7 @@
return None
raise sys_power.SpuriousWakeupError('Spurious wake in S3: %s | %s'
% (wake_elog, wake_syslog))
- if utils.get_board() in ['lumpy', 'stumpy', 'kiev']:
+ if self._get_board() in ['lumpy', 'stumpy', 'kiev']:
logging.debug('RTC read failure (crosbug/36004), dumping nvram:\n' +
utils.system_output('mosys nvram dump', ignore_status=True))
return None
@@ -370,7 +375,7 @@
for _ in xrange(10):
self._reset_logs()
utils.system('sync')
- board_delay = self._SUSPEND_DELAY.get(utils.get_board(), 3)
+ board_delay = self._SUSPEND_DELAY.get(self._get_board(), 3)
try:
alarm = self._suspend(duration + board_delay)
except sys_power.SpuriousWakeupError: