Index: tools/perf/metrics/cpu_unittest.py |
diff --git a/tools/perf/metrics/cpu_unittest.py b/tools/perf/metrics/cpu_unittest.py |
index 30d488dac8bc420399e00f32ea8a6fff6b8277d0..2d275218d0b37b57a03ae71124b424eccb6967ed 100644 |
--- a/tools/perf/metrics/cpu_unittest.py |
+++ b/tools/perf/metrics/cpu_unittest.py |
@@ -31,3 +31,47 @@ class CpuMetricTest(unittest.TestCase): |
self.assertEqual({'Browser': 0.25, 'Renderer': 0.1}, |
cpu._SubtractCpuStats(end, start)) |
+ # The result for global frequency stats is used. |
+ start = { |
+ 'Browser': {'CpuProcessTime': 0, 'TotalTime': 0}, |
+ 'Global': {'GlobalCpuFrequencyStats': {1000000000: 9, 2000000000: 19}} |
+ } |
+ end = { |
+ 'Browser': {'CpuProcessTime': 5, 'TotalTime': 20}, |
+ 'Global': {'GlobalCpuFrequencyStats': {1000000000: 20, 2000000000: 31}} |
+ } |
+ |
+ expected = { |
+ 'Browser': 0.25, |
+ 'Global': {'GlobalCpuFrequencyStats': {1000000000: 11, 2000000000: 12}} |
+ } |
+ |
+ self.assertEqual(expected, cpu._SubtractCpuStats(end, start)) |
+ |
+ def testAddResults(self): |
+ results = { |
+ 'Browser': 0.25, |
+ 'Global': {'GlobalCpuFrequencyStats': {1000000000: 11, 2000000000: 12}} |
+ } |
+ class MockResults(object): |
+ def __init__(self): |
+ self.trace_name = None |
+ self.units = None |
+ self.value = None |
+ self.chart_name = None |
+ self.data_type = None |
+ |
+ def Add(self, trace_name, units, value, chart_name=None, |
+ data_type='default'): |
+ self.trace_name = trace_name |
+ self.units = units |
+ self.value = value |
+ self.chart_name = chart_name |
+ self.data_type = data_type |
+ |
+ mock_results = MockResults() |
+ cpu_metric = cpu.CpuMetric(None) |
+ cpu_metric._results = results |
+ cpu_metric.AddResults(None, mock_results) |
+ self.assertEquals(1521.74, mock_results.value) |
+ |