graphics_VideoRenderingPower: handle no battery_path.
Speculative fix avoiding exception.
BUG=chromium:883614
TEST=pylint/pyformat
Change-Id: Ia0965c79cf8aab14f741529f7d523ddaa415dbc7
Reviewed-on: https://chromium-review.googlesource.com/1225415
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Trybot-Ready: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>
diff --git a/client/site_tests/graphics_VideoRenderingPower/graphics_VideoRenderingPower.py b/client/site_tests/graphics_VideoRenderingPower/graphics_VideoRenderingPower.py
index 984292a..0a68f16 100644
--- a/client/site_tests/graphics_VideoRenderingPower/graphics_VideoRenderingPower.py
+++ b/client/site_tests/graphics_VideoRenderingPower/graphics_VideoRenderingPower.py
@@ -16,8 +16,11 @@
['hw_overlays_hw_decode', ['']],
['no_overlays_hw_decode', ['--enable-hardware-overlays=']],
['hw_overlays_sw_decode', ['--disable-accelerated-video-decode']],
- ['no_overlays_sw_decode',
- ['--disable-accelerated-video-decode', '--enable-hardware-overlays=']]]
+ [
+ 'no_overlays_sw_decode',
+ ['--disable-accelerated-video-decode', '--enable-hardware-overlays=']
+ ]
+]
# Amount of time to wait for the URL to load and the video to start playing.
PREAMBLE_DURATION_SECONDS = 8
# Amount of time to let the video play while measuring power consumption.
@@ -33,6 +36,7 @@
class graphics_VideoRenderingPower(graphics_utils.GraphicsTest):
"""This test renders on screen for a short while a video from a given
+
(controlled) URL while measuring the power consumption of the different SoC
domains.
"""
@@ -76,7 +80,12 @@
'skipping test.')
return
- rapl = [power_status.SystemPower(self._power_status.battery_path)]
+ rapl = []
+ if power_utils.has_battery():
+ rapl.append(
+ power_status.SystemPower(self._power_status.battery_path))
+ else:
+ logging.warning('This board has no battery.')
rapl += power_rapl.create_rapl()
for test_name_and_flags in TEST_NAME_AND_FLAGS:
