Remove non-quiescent sites from power.top_25

tools/perf/benchmarks/power.py

 # Copyright 2014 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 core import perf_benchmark
 
 from benchmarks import silk_flags
 from measurements import power
 import page_sets
 from telemetry import benchmark
@@ skipping 129 matching lines @@
   page_set = page_sets.Top25PageSet
 
   def SetExtraBrowserOptions(self, options):
     options.full_performance_mode = False
 
   @classmethod
   def Name(cls):
     return 'power.top_25'
 
   def CreateStorySet(self, _):
-    # Exclude techcrunch.com. It is not suitable for this benchmark because it
-    # does not consistently become quiescent within 60 seconds.
     stories = self.page_set()
-    found = next((x for x in stories if 'techcrunch.com' in x.url), None)
-    if found:
-      stories.RemoveStory(found)
+    to_remove = [x for x in stories if self.IsPageNotQuiescent(x.url)]
+    for story in to_remove:
+      stories.RemoveStory(story)
     return stories
 
+  @staticmethod
+  def IsPageNotQuiescent(page_url):
+    # Exclude sites not suitable for this benchmark because they do not
+    # consistently become quiescent within 60 seconds.
+    non_quiescent_urls = [
+        'techcrunch.com',

[petrcermak, 2016/10/03 08:07:51]

nit: this should be indented only 2 spaces (-2)

[ericrk, 2016/10/03 17:47:27]

Done.

+        'docs.google.com',
+        'plus.google.com'
+    ]
+
+    return any(url in page_url for url in non_quiescent_urls)
+
 
 @benchmark.Enabled('mac')
-class PowerGpuRasterizationTop25(perf_benchmark.PerfBenchmark):
+class PowerGpuRasterizationTop25(PowerTop25):
   """Top 25 quiescent power test with GPU rasterization enabled."""
   tag = 'gpu_rasterization'
   test = power.QuiescentPower

[petrcermak, 2016/10/03 08:07:51]

you don't need the 'test' and 'page_set' fields here (inherited)

[ericrk, 2016/10/03 17:47:27]

Done.

   page_set = page_sets.Top25PageSet
 
   def SetExtraBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
     options.full_performance_mode = False
 
   @classmethod
   def Name(cls):
     return 'power.gpu_rasterization.top_25'
 
-  def CreateStorySet(self, _):
-    # Exclude techcrunch.com. It is not suitable for this benchmark because it
-    # does not consistently become quiescent within 60 seconds.
-    stories = self.page_set()
-    found = next((x for x in stories if 'techcrunch.com' in x.url), None)
-    if found:
-      stories.RemoveStory(found)
-    return stories
-
 
 @benchmark.Enabled('mac')
 class PowerScrollingTrivialPage(perf_benchmark.PerfBenchmark):
   """Measure power consumption for some very simple pages."""
   test = power.QuiescentPower
   page_set = page_sets.MacGpuTrivialPagesStorySet
 
   @classmethod
   def Name(cls):
     return 'power.trivial_pages'
 
 @benchmark.Enabled('mac')
 class PowerSteadyStatePages(perf_benchmark.PerfBenchmark):
   """Measure power consumption for real web sites in steady state (no user
   interactions)."""
   test = power.QuiescentPower
   page_set = page_sets.IdleAfterLoadingStories
 
   @classmethod
   def Name(cls):
     return 'power.steady_state'