Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Unified Diff: tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py

Issue 1440013002: [Android][Telemetry] Add logging and temporarily ensure StopMonitoringPower is called. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/telemetry/telemetry/core/platform.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py
diff --git a/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py b/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py
index 46514e1704f6eb1ef415e35acc97ec77de1c920b..7c5aefd799a41483899a52751db00dd8dea32a60 100644
--- a/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py
+++ b/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py
@@ -28,7 +28,13 @@ class PowerMonitorController(power_monitor.PowerMonitor):
return any(m.CanMonitorPower() for m in self._candidate_power_monitors)
def StartMonitoringPower(self, browser):
- assert not self._active_monitors, 'Must call StopMonitoringPower().'
+ # TODO(rnephew): re-add assert when crbug.com/553601 is solved and
+ # StopMonitoringPower is called in the correct place.
+ if self._active_monitors:
+ logging.warning('StopMonitoringPower() not called when expected. Last '
+ 'results are likely not reported.')
+ self.StopMonitoringPower()
+
self._active_monitors = (
[m for m in self._candidate_power_monitors if m.CanMonitorPower()])
assert self._active_monitors, 'No available monitor.'
« no previous file with comments | « tools/telemetry/telemetry/core/platform.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698