Telemetry: re-enable cpu metric for page_cycler.

tools/perf/measurements/page_cycler_unittest.py

Index: tools/perf/measurements/page_cycler_unittest.py
diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py
index 5923b3ff6deb4e72d2496d715e6d792afe4b9cb2..fe05892fd97fe26251ded9f827cb7c6b44cc1a7e 100644
--- a/tools/perf/measurements/page_cycler_unittest.py
+++ b/tools/perf/measurements/page_cycler_unittest.py
@@ -53,6 +53,22 @@ class FakeTab(object):
     pass
 
 
+class FakeBrowser(object):
+  _iteration = 0
+
+  @property
+  def cpu_stats(self):
+    FakeBrowser._iteration += 1
+    return {
+        'Browser': {'CpuProcessTime': FakeBrowser._iteration,
+                    'TotalTime': FakeBrowser._iteration * 2},
+        'Renderer': {'CpuProcessTime': FakeBrowser._iteration,
+                    'TotalTime': FakeBrowser._iteration * 3},
+        'Gpu': {'CpuProcessTime': FakeBrowser._iteration,
+                 'TotalTime': FakeBrowser._iteration * 4}
+    }
+
+
 class PageCyclerUnitTest(unittest.TestCase):
 
   def SetUpCycler(self, args, setup_memory_module=False):
@@ -79,7 +95,7 @@ class PageCyclerUnitTest(unittest.TestCase):
       real_memory_module = page_cycler.memory
       try:
         page_cycler.memory = mock_memory_module
-        cycler.DidStartBrowser(None)
+        cycler.DidStartBrowser(FakeBrowser())
       finally:
         page_cycler.memory = real_memory_module
 
@@ -122,8 +138,15 @@ class PageCyclerUnitTest(unittest.TestCase):
       values = results.page_specific_values_for_current_page
       results.DidMeasurePage()
 
-      self.assertEqual(1, len(values))
+      self.assertEqual(4, len(values))
       self.assertEqual(values[0].page, page)

[bulach, 2014/04/23 17:11:47]

please advise: note that here and the test below, it had already broken the
principle you mentioned as these are not truly "unit", they're larger sort of
integration-type tests..

I'm happy to consolidate (141-147) and (171-181) together in its own test if you
prefer.

as for he values themselves: happy to test if you prefer, but as you said, the
actual computation is deeper down in metrics/cpu..

please let me know your thoughts!

[qyearsley, 2014/04/23 18:13:38]

My thoughts are that this CL LGTM as is. But, in theory, the test would be
easier to understand if it were re-organized so that one test method tests only
one thing. Perhaps outside of the scope of this CL.

[bulach, 2014/04/24 08:57:00]

sgtm! I'll CQ this as is and send you a separate CL shortly splitting the  tests
shortly.

+      self.assertEqual(values[1].name,
+          'cpu_utilization.cpu_utilization_gpu')
+      self.assertEqual(values[2].name,
+          'cpu_utilization.cpu_utilization_renderer')
+      self.assertEqual(values[3].name,
+          'cpu_utilization.cpu_utilization_browser')
+
 
       chart_name = 'cold_times' if i == 0 or i > 2 else 'warm_times'
       self.assertEqual(values[0].name, '%s.page_load_time' % chart_name)
@@ -145,10 +168,16 @@ class PageCyclerUnitTest(unittest.TestCase):
         values = results.page_specific_values_for_current_page
         results.DidMeasurePage()
 
-        self.assertEqual(1, len(values))
+        self.assertEqual(4, len(values))
         self.assertEqual(values[0].page, page)
 
         chart_name = 'cold_times' if i == 0 or i > 1 else 'warm_times'
         self.assertEqual(values[0].name, '%s.page_load_time' % chart_name)
+        self.assertEqual(values[1].name,
+            'cpu_utilization.cpu_utilization_gpu')
+        self.assertEqual(values[2].name,
+            'cpu_utilization.cpu_utilization_renderer')
+        self.assertEqual(values[3].name,
+            'cpu_utilization.cpu_utilization_browser')
 
         cycler.DidNavigateToPage(page, tab)