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

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

Issue 797003002: Replaced @benchmark.Enabled/Disabled and @test.Enabled/Disabled with @decorators.Enabled/Disabled i… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed some bad imports Created 6 years 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/powermetrics_power_monitor_unittest.py
diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor_unittest.py b/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor_unittest.py
index 87e5b304757f6717351ee05d9d7499f663b6ef55..1c83a902a9829342de62b561e576f109deb9ed7e 100644
--- a/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor_unittest.py
+++ b/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor_unittest.py
@@ -6,11 +6,11 @@ import logging
import os
import unittest
+from telemetry import decorators
from telemetry.core import util
from telemetry.core.platform import mac_platform_backend
from telemetry.core.platform import platform_backend
from telemetry.core.platform.power_monitor import powermetrics_power_monitor
-from telemetry.unittest_util import test
def _parsePowerMetricsDataFromTestFile(output_file):
@@ -22,7 +22,7 @@ def _parsePowerMetricsDataFromTestFile(output_file):
class PowerMetricsPowerMonitorTest(unittest.TestCase):
- @test.Enabled('mac')
+ @decorators.Enabled('mac')
def testCanMonitorPowerUsage(self):
backend = mac_platform_backend.MacPlatformBackend()
power_monitor = powermetrics_power_monitor.PowerMetricsPowerMonitor(backend)
@@ -32,19 +32,19 @@ class PowerMetricsPowerMonitorTest(unittest.TestCase):
self.assertEqual(power_monitor.CanMonitorPower(), mavericks_or_later,
"Error checking powermetrics availability: '%s'" % '|'.join(os.uname()))
- @test.Enabled('mac')
+ @decorators.Enabled('mac')
def testParseEmptyPowerMetricsOutput(self):
# Important to handle zero length powermetrics outout - crbug.com/353250 .
self.assertIsNone(powermetrics_power_monitor.PowerMetricsPowerMonitor.
ParsePowerMetricsOutput(''))
- @test.Enabled('mac')
+ @decorators.Enabled('mac')
def testParsePowerMetricsOutputFromVM(self):
# Don't fail when running on VM - crbug.com/423688.
self.assertEquals({},
_parsePowerMetricsDataFromTestFile('powermetrics_vmware.output'))
- @test.Enabled('mac')
+ @decorators.Enabled('mac')
def testParsePowerMetricsOutput(self):
power_monitor = powermetrics_power_monitor.PowerMetricsPowerMonitor(
mac_platform_backend.MacPlatformBackend())

Powered by Google App Engine
This is Rietveld 408576698