Make sure advancing non-zero time delta for mock timer in testScrollLatencyFromTimeline

tools/perf/metrics/rendering_stats_unittest.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import random
 import unittest
 
 from metrics.rendering_stats import UI_COMP_NAME, BEGIN_COMP_NAME, END_COMP_NAME
 from metrics.rendering_stats import GetScrollInputLatencyEvents
 from metrics.rendering_stats import ComputeMouseWheelScrollLatency
@@ skipping 135 matching lines @@
 def AddInputLatencyStats(mock_timer, input_type, start_thread, end_thread,
                          ref_latency_stats = None):
   """ Adds a random input latency stats event.
 
   input_type: The input type for which the latency slice is generated.
   start_thread: The start thread on which the async slice is added.
   end_thread: The end thread on which the async slice is ended.
   ref_latency_stats: A ReferenceInputLatencyStats object for expected values.
   """
 
-  mock_timer.Advance()
+  mock_timer.Advance(2, 4)
   ui_comp_time = mock_timer.Get() * 1000.0
-  mock_timer.Advance()
+  mock_timer.Advance(2, 4)
   begin_comp_time = mock_timer.Get() * 1000.0
   mock_timer.Advance(10, 20)
   end_comp_time = mock_timer.Get() * 1000.0
 
   data = { UI_COMP_NAME: {'time': ui_comp_time},
            BEGIN_COMP_NAME: {'time': begin_comp_time},
            END_COMP_NAME: {'time': end_comp_time} }
 
   timestamp = mock_timer.Get()
 
@@ skipping 64 matching lines @@
     browser_main = browser.GetOrCreateThread(tid = 11)
     browser_compositor = browser.GetOrCreateThread(tid = 12)
     renderer = timeline.GetOrCreateProcess(pid = 2)
     renderer_main = renderer.GetOrCreateThread(tid = 21)
     renderer_compositor = renderer.GetOrCreateThread(tid = 22)
 
     timer = MockTimer()
     ref_stats = ReferenceRenderingStats()
 
     # Create 10 main and impl rendering stats events for Action A.
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.BeginSlice('webkit.console', 'ActionA', timer.Get(), '')
     ref_stats.AppendNewRange()
     for i in xrange(0, 10):
       first = (i == 0)
       AddMainThreadRenderingStats(timer, renderer_main, first, None)
       AddImplThreadRenderingStats(timer, renderer_compositor, first, None)
       AddMainThreadRenderingStats(timer, browser_main, first, ref_stats)
       AddImplThreadRenderingStats(timer, browser_compositor, first, ref_stats)
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.EndSlice(timer.Get())
 
     # Create 5 main and impl rendering stats events not within any action.
     for i in xrange(0, 5):
       first = (i == 0)
       AddMainThreadRenderingStats(timer, renderer_main, first, None)
       AddImplThreadRenderingStats(timer, renderer_compositor, first, None)
       AddMainThreadRenderingStats(timer, browser_main, first, None)
       AddImplThreadRenderingStats(timer, browser_compositor, first, None)
 
     # Create 10 main and impl rendering stats events for Action B.
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.BeginSlice('webkit.console', 'ActionB', timer.Get(), '')
     ref_stats.AppendNewRange()
     for i in xrange(0, 10):
       first = (i == 0)
       AddMainThreadRenderingStats(timer, renderer_main, first, None)
       AddImplThreadRenderingStats(timer, renderer_compositor, first, None)
       AddMainThreadRenderingStats(timer, browser_main, first, ref_stats)
       AddImplThreadRenderingStats(timer, browser_compositor, first, ref_stats)
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.EndSlice(timer.Get())
 
     # Create 10 main and impl rendering stats events for Action A.
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.BeginSlice('webkit.console', 'ActionA', timer.Get(), '')
     ref_stats.AppendNewRange()
     for i in xrange(0, 10):
       first = (i == 0)
       AddMainThreadRenderingStats(timer, renderer_main, first, None)
       AddImplThreadRenderingStats(timer, renderer_compositor, first, None)
       AddMainThreadRenderingStats(timer, browser_main, first, ref_stats)
       AddImplThreadRenderingStats(timer, browser_compositor, first, ref_stats)
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.EndSlice(timer.Get())
 
     browser.FinalizeImport()
     renderer.FinalizeImport()
 
     timeline_markers = timeline.FindTimelineMarkers(
         ['ActionA', 'ActionB', 'ActionA'])
     timeline_ranges = [ timeline_bounds.Bounds.CreateFromEvent(marker)
                         for marker in timeline_markers ]
     stats = RenderingStats(renderer, browser, timeline_ranges)
@@ skipping 20 matching lines @@
     # Create a browser process and a renderer process.
     browser = timeline.GetOrCreateProcess(pid = 1)
     browser_main = browser.GetOrCreateThread(tid = 11)
     renderer = timeline.GetOrCreateProcess(pid = 2)
     renderer_main = renderer.GetOrCreateThread(tid = 21)
 
     timer = MockTimer()
     ref_latency_stats = ReferenceInputLatencyStats()
 
     # Create 10 input latency stats events for Action A.
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.BeginSlice('webkit.console', 'ActionA', timer.Get(), '')
     for _ in xrange(0, 10):
       AddInputLatencyStats(timer, 'MouseWheel', browser_main,
                            renderer_main, ref_latency_stats)
       AddInputLatencyStats(timer, 'GestureScrollUpdate', browser_main,
                            renderer_main, ref_latency_stats)
       AddInputLatencyStats(timer, 'TouchMove', browser_main,
                            renderer_main, ref_latency_stats)
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.EndSlice(timer.Get())
 
     # Create 5 input latency stats events not within any action.
+    timer.Advance(2, 4)
     for _ in xrange(0, 5):
       AddInputLatencyStats(timer, 'MouseWheel', browser_main,
                            renderer_main, None)
       AddInputLatencyStats(timer, 'GestureScrollUpdate', browser_main,
                            renderer_main, None)
       AddInputLatencyStats(timer, 'TouchMove', browser_main,
                            renderer_main, None)
 
     # Create 10 input latency stats events for Action B.
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.BeginSlice('webkit.console', 'ActionB', timer.Get(), '')
     for _ in xrange(0, 10):
       AddInputLatencyStats(timer, 'MouseWheel', browser_main,
                            renderer_main, ref_latency_stats)
       AddInputLatencyStats(timer, 'GestureScrollUpdate', browser_main,
                            renderer_main, ref_latency_stats)
       AddInputLatencyStats(timer, 'TouchMove', browser_main,
                            renderer_main, ref_latency_stats)
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.EndSlice(timer.Get())
 
     # Create 10 input latency stats events for Action A.
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.BeginSlice('webkit.console', 'ActionA', timer.Get(), '')
     for _ in xrange(0, 10):
       AddInputLatencyStats(timer, 'MouseWheel', browser_main,
                                   renderer_main, ref_latency_stats)
       AddInputLatencyStats(timer, 'GestureScrollUpdate', browser_main,
                                   renderer_main, ref_latency_stats)
       AddInputLatencyStats(timer, 'TouchMove', browser_main,
                                   renderer_main, ref_latency_stats)
-    timer.Advance()
+    timer.Advance(2, 4)
     renderer_main.EndSlice(timer.Get())
 
     browser.FinalizeImport()
     renderer.FinalizeImport()
 
     mouse_wheel_scroll_events = []
     touch_scroll_events = []
     js_touch_scroll_events = []
 
     timeline_markers = timeline.FindTimelineMarkers(
@@ skipping 17 matching lines @@
     self.assertEquals(touch_scroll_events,
                       ref_latency_stats.touch_scroll_events)
     self.assertEquals(js_touch_scroll_events,
                       ref_latency_stats.js_touch_scroll_events)
     self.assertEquals(ComputeMouseWheelScrollLatency(mouse_wheel_scroll_events),
                       ref_latency_stats.mouse_wheel_scroll_latency)
     self.assertEquals(ComputeTouchScrollLatency(touch_scroll_events),
                       ref_latency_stats.touch_scroll_latency)
     self.assertEquals(ComputeTouchScrollLatency(js_touch_scroll_events),
                       ref_latency_stats.js_touch_scroll_latency)