[Telemetry] Add trivial pages page set to BattOr benchmarks.

tools/perf/page_sets/mac_gpu_sites.py

 # Copyright 2016 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.
 from telemetry.page import page as page_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
 
 class _NoGpuSharedPageState(shared_page_state.SharedPageState):
   def __init__(self, test, finder_options, story_set):
@@ skipping 12 matching lines @@
 
 
 class _NoWebGLImageChromiumSharedPageState(shared_page_state.SharedPageState):
   def __init__(self, test, finder_options, story_set):
     super(_NoWebGLImageChromiumSharedPageState, self).__init__(
       test, finder_options, story_set)
     finder_options.browser_options.AppendExtraBrowserArgs(
       ['--disable-webgl-image-chromium'])
 
 
-class TrivialScrollingPage(page_module.Page):
+class _BasePage(page_module.Page):
+  def __init__(self, page_set, shared_page_state_class, url, name, wait=None):

[erikchen, 2016/08/19 19:20:05]

you shouldn't need a default argument here, right?

[rnephew (Reviews Here), 2016/08/19 20:20:55]

Done.

+    super(_BasePage, self).__init__(
+      url=url, page_set=page_set, name=name,
+      shared_page_state_class=shared_page_state_class)
+    self._wait = wait

[erikchen, 2016/08/19 19:20:05]

Can you add a comment that _wait is intended to be a duration in seconds? That's
not otherwise clear.

[rnephew (Reviews Here), 2016/08/19 20:20:55]

Done.

[erikchen, 2016/08/19 20:27:55]

Did you forget to include the comment in your patch set? Do you think the
comment would be more clear here or on MacGpuTrivialPagesStorySet.__init__ now
that you've done the refactor?

[rnephew (Reviews Here), 2016/08/19 20:52:45]

I wrote the comment, then did the refactoring and must have accidentally deleted
it during that. I think it makes more sense at the init so putting it there.

 
-  def __init__(self, page_set, shared_page_state_class):
+  def RunPageInteractions(self, action_runner):
+    if self._wait:
+      action_runner.Wait(self._wait)
+
+
+class TrivialScrollingPage(_BasePage):
+
+  def __init__(self, page_set, shared_page_state_class, wait=None):
     super(TrivialScrollingPage, self).__init__(
         url='file://trivial_sites/trivial_scrolling_page.html',
         page_set=page_set,
         name=self.__class__.__name__ + shared_page_state_class.__name__,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        wait=wait)
 
 
-class TrivialBlinkingCursorPage(page_module.Page):
+class TrivialBlinkingCursorPage(_BasePage):
 
-  def __init__(self, page_set, shared_page_state_class):
+  def __init__(self, page_set, shared_page_state_class, wait=None):
     super(TrivialBlinkingCursorPage, self).__init__(
         url='file://trivial_sites/trivial_blinking_cursor.html',
         page_set=page_set,
         name=self.__class__.__name__ + shared_page_state_class.__name__,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        wait=wait)
 
 
-class TrivialCanvasPage(page_module.Page):
+class TrivialCanvasPage(_BasePage):
 
-  def __init__(self, page_set, shared_page_state_class):
+  def __init__(self, page_set, shared_page_state_class, wait=None):
     super(TrivialCanvasPage, self).__init__(
         url='file://trivial_sites/trivial_canvas.html',
         page_set=page_set,
         name=self.__class__.__name__ + shared_page_state_class.__name__,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        wait=wait)
 
 
-class TrivialWebGLPage(page_module.Page):
+class TrivialWebGLPage(_BasePage):
 
-  def __init__(self, page_set, shared_page_state_class):
+  def __init__(self, page_set, shared_page_state_class, wait=None):
     super(TrivialWebGLPage, self).__init__(
         url='file://trivial_sites/trivial_webgl.html',
         page_set=page_set,
         name=self.__class__.__name__ + shared_page_state_class.__name__,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        wait=wait)
 
 
-class TrivialBlurAnimationPage(page_module.Page):
+class TrivialBlurAnimationPage(_BasePage):
 
-  def __init__(self, page_set, shared_page_state_class):
+  def __init__(self, page_set, shared_page_state_class, wait=None):
     super(TrivialBlurAnimationPage, self).__init__(
         url='file://trivial_sites/trivial_blur_animation.html',
         page_set=page_set,
         name=self.__class__.__name__ + shared_page_state_class.__name__,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        wait=wait)
 
 
-class TrivialFullscreenVideoPage(page_module.Page):
+class TrivialFullscreenVideoPage(_BasePage):
 
-  def __init__(self, page_set, shared_page_state_class):
+  def __init__(self, page_set, shared_page_state_class, wait=None):
     super(TrivialFullscreenVideoPage, self).__init__(
         url='file://trivial_sites/trivial_fullscreen_video.html',
         page_set=page_set,
         name=self.__class__.__name__ + shared_page_state_class.__name__,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        wait=wait)
 
   def RunPageInteractions(self, action_runner):
     action_runner.PressKey("Return")
+    super(TrivialFullscreenVideoPage, self).RunPageInteractions(action_runner)
 
 
-class TrivialGifPage(page_module.Page):
+class TrivialGifPage(_BasePage):
 
-  def __init__(self, page_set, shared_page_state_class):
+  def __init__(self, page_set, shared_page_state_class, wait=None):
     super(TrivialGifPage, self).__init__(
         url='file://trivial_sites/trivial_gif.html',
         page_set=page_set,
         name=self.__class__.__name__ + shared_page_state_class.__name__,
-        shared_page_state_class=shared_page_state_class)
+        shared_page_state_class=shared_page_state_class,
+        wait=wait)
 
 
 class MacGpuTrivialPagesStorySet(story.StorySet):
 
   def __init__(self):
     super(MacGpuTrivialPagesStorySet, self).__init__(
         cloud_storage_bucket=story.PUBLIC_BUCKET)
     self.AddStory(TrivialScrollingPage(self, shared_page_state.SharedPageState))
     self.AddStory(TrivialBlinkingCursorPage(
         self, shared_page_state.SharedPageState))
@@ skipping 19 matching lines @@
     self.AddStory(TrivialWebGLPage(self, _NoWebGLImageChromiumSharedPageState))
     self.AddStory(TrivialBlurAnimationPage(self, _NoGpuSharedPageState))
     self.AddStory(TrivialFullscreenVideoPage(self, _NoGpuSharedPageState))
     self.AddStory(TrivialGifPage(self, _NoGpuSharedPageState))
 
   @property
   def allow_mixed_story_states(self):
     # Return True here in order to be able to add the same tests with
     # a different SharedPageState.
     return True
+
+class MacGpuTrivialPagesStorySetWithWait(story.StorySet):
+
+  _WAIT_TIME = 30
+
+  def __init__(self):
+    super(MacGpuTrivialPagesStorySetWithWait, self).__init__(

[erikchen, 2016/08/19 19:20:05]

This looks like a giant copy paste. Could you find a way to refactor this?

[rnephew (Reviews Here), 2016/08/19 20:20:55]

Done.

+        cloud_storage_bucket=story.PUBLIC_BUCKET)
+    self.AddStory(TrivialScrollingPage(
+        self, shared_page_state.SharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialBlinkingCursorPage(
+        self, shared_page_state.SharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialCanvasPage(
+        self, shared_page_state.SharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialWebGLPage(
+        self, shared_page_state.SharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialBlurAnimationPage(
+        self, shared_page_state.SharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialFullscreenVideoPage(
+        self, shared_page_state.SharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialGifPage(
+        self, shared_page_state.SharedPageState, wait=self._WAIT_TIME))
+
+    self.AddStory(TrivialScrollingPage(
+        self, _NoOverlaysSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialBlinkingCursorPage(
+        self, _NoOverlaysSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialCanvasPage(
+        self, _NoOverlaysSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialWebGLPage(
+        self, _NoOverlaysSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialBlurAnimationPage(
+        self, _NoOverlaysSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialFullscreenVideoPage(
+        self, _NoOverlaysSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialGifPage(
+        self, _NoOverlaysSharedPageState, wait=self._WAIT_TIME))
+
+    self.AddStory(TrivialScrollingPage(
+        self, _NoGpuSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialBlinkingCursorPage(
+        self, _NoGpuSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialCanvasPage(
+        self, _NoGpuSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialWebGLPage(
+        self, _NoWebGLImageChromiumSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialBlurAnimationPage(
+        self, _NoGpuSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialFullscreenVideoPage(
+        self, _NoGpuSharedPageState, wait=self._WAIT_TIME))
+    self.AddStory(TrivialGifPage(
+        self, _NoGpuSharedPageState, wait=self._WAIT_TIME))
+
+  @property
+  def allow_mixed_story_states(self):
+    # Return True here in order to be able to add the same tests with
+    # a different SharedPageState.
+    return True