Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(669)

Unified Diff: tools/perf/benchmarks/benchmark_smoke_unittest.py

Issue 1212213003: Revert of Fix tab_switching measurement bug. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/perf/measurements/tab_switching.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/benchmarks/benchmark_smoke_unittest.py
diff --git a/tools/perf/benchmarks/benchmark_smoke_unittest.py b/tools/perf/benchmarks/benchmark_smoke_unittest.py
index 00293ee1b437f39d4c973c4f69d134d55481551a..926d36732b938f41433149927f655e92c8dba658 100644
--- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
+++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
@@ -30,8 +30,7 @@
from benchmarks import sunspider
-def SmokeTestGenerator(benchmark, num_pages=1):
- """Generates a benchmark that includes first N pages from pageset."""
+def SmokeTestGenerator(benchmark):
# NOTE TO SHERIFFS: DO NOT DISABLE THIS TEST.
#
# This smoke test dynamically tests all benchmarks. So disabling it for one
@@ -48,11 +47,10 @@
def CreateStorySet(self, options):
# pylint: disable=E1002
story_set = super(SinglePageBenchmark, self).CreateStorySet(options)
- stories = []
- for story in story_set.stories[:num_pages]:
+ for story in story_set.stories:
story.skip_waits = True
- stories.append(story)
- story_set.stories = stories
+ story_set.stories = [story]
+ break
return story_set
# Set the benchmark's default arguments.
@@ -122,11 +120,7 @@
class BenchmarkSmokeTest(unittest.TestCase):
pass
- # It is wrong to give tab_switching only one page to switch.
- if 'tab_switching' in benchmark.Name():
- method = SmokeTestGenerator(benchmark, num_pages=2)
- else:
- method = SmokeTestGenerator(benchmark)
+ method = SmokeTestGenerator(benchmark)
# Make sure any decorators are propagated from the original declaration.
# (access to protected members) pylint: disable=W0212
« no previous file with comments | « no previous file | tools/perf/measurements/tab_switching.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698