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

Unified Diff: tools/telemetry/telemetry/core/platform/power_monitor/msr_power_monitor_unittest.py

Issue 582123003: Revert of [telemetry] Read MSRs from a separate privileged process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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
Index: tools/telemetry/telemetry/core/platform/power_monitor/msr_power_monitor_unittest.py
diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/msr_power_monitor_unittest.py b/tools/telemetry/telemetry/core/platform/power_monitor/msr_power_monitor_unittest.py
index f3408a759e2e6d767618425d1c42689defeaf09c..6a28509f4dca89fe360654046b1f72a9829dec54 100644
--- a/tools/telemetry/telemetry/core/platform/power_monitor/msr_power_monitor_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/power_monitor/msr_power_monitor_unittest.py
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import logging
-import time
import unittest
from telemetry import decorators
@@ -13,7 +12,12 @@
class MsrPowerMonitorTest(unittest.TestCase):
@decorators.Enabled('win')
- def testMsrRuns(self):
+ def testFindOrInstallWinRing0(self):
+ self.assertTrue(msr_power_monitor.WinRing0Path())
+
+ @decorators.Enabled('win')
+ def testMsrRunsWithoutErrors(self):
+ # Very basic test, doesn't validate any output data.
platform_backend = win_platform_backend.WinPlatformBackend()
power_monitor = msr_power_monitor.MsrPowerMonitor(platform_backend)
if not power_monitor.CanMonitorPower():
@@ -21,9 +25,7 @@
return
power_monitor.StartMonitoringPower(None)
- time.sleep(0.01)
statistics = power_monitor.StopMonitoringPower()
self.assertEqual(statistics['identifier'], 'msr')
self.assertIn('energy_consumption_mwh', statistics)
- self.assertGreater(statistics['energy_consumption_mwh'], 0)

Powered by Google App Engine
This is Rietveld 408576698