firmware_ECWakeSource: Skip hibernate test if the device doesn't have hibernate support.
Remove the hack that skips the test if the device has no display.
BUG=b:178244241
TEST=Ran test on karma chromebox
Cq-Depend: chromium:2657444
Change-Id: Ic89f3e4e2b441332df28d01da3cb33089d5dc54d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2659655
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Brent Peterson <brentpeterson@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
diff --git a/server/site_tests/firmware_ECWakeSource/firmware_ECWakeSource.py b/server/site_tests/firmware_ECWakeSource/firmware_ECWakeSource.py
index 9cd1c52..05f1f06 100644
--- a/server/site_tests/firmware_ECWakeSource/firmware_ECWakeSource.py
+++ b/server/site_tests/firmware_ECWakeSource/firmware_ECWakeSource.py
@@ -227,11 +227,16 @@
if self.servo.main_device_is_ccd():
logging.info('With CCD, we can\'t wake up the DUT from hibernate '
'by power button. Skip hibernate test.')
- elif not self.faft_config.ec_has_hibernate_cmd:
- logging.info('EC does not support hibernate. Skip hibernate test.')
- elif not self.has_internal_display:
- logging.info('For the form factors without internal display, '
- 'hibernate is not useful. Skip hibernate test.')
+ elif not self.faft_config.hibernate:
+ logging.info(
+ 'The device does not support hibernate. Skip hibernate test.'
+ )
+ elif not self._client.has_battery():
+ logging.warning(
+ 'The device claims to have hibernate support, but does not '
+ 'have a battery. It probably does not actually have hibernate '
+ 'support, edit the device.json file in fw-testing-configs. '
+ 'Skip hibernate test.')
else:
logging.info('EC hibernate and wake by power button.')
self.hibernate_and_wake_by_power_button(host)
