Chromium Code Reviews| Index: tools/perf/benchmarks/memory_infra.py |
| diff --git a/tools/perf/benchmarks/memory_infra.py b/tools/perf/benchmarks/memory_infra.py |
| index fdece27ae74262c8fc94fd307e8bf315be22b98a..28ad406591c702f6df2950816252a45ac3194c93 100644 |
| --- a/tools/perf/benchmarks/memory_infra.py |
| +++ b/tools/perf/benchmarks/memory_infra.py |
| @@ -115,7 +115,7 @@ class TBMv2MemoryBenchmarkTop10Mobile(MemoryBenchmarkTop10Mobile): |
| return not _IGNORED_STATS_RE.search(value.name) |
| -# Benchmark is disabled by default because it takes too long to run. |
| +# Benchmark disabled by default. Force to run with --also-run-disabled-tests. |
| @benchmark.Disabled('all') |
| class DualBrowserBenchmark(_MemoryInfra): |
| """Measures memory usage while interacting with two different browsers. |
| @@ -139,6 +139,33 @@ class DualBrowserBenchmark(_MemoryInfra): |
| return not _IGNORED_STATS_RE.search(value.name) |
| +# Benchmark disabled by default. Force to run with --also-run-disabled-tests. |
| +@benchmark.Disabled('all') |
| +class LongRunningDualBrowserBenchmark(_MemoryInfra): |
| + """Measures memory during prolonged usage of alternating browsers. |
| + |
| + Same as memory.dual_browser_test, but the test is run for 60 iterations |
| + and the browser is *not* restarted between page set repeats. |
| + """ |
| + TBM_VERSION = 2 |
| + page_set = page_sets.DualBrowserStorySet |
| + options = {'pageset_repeat': 60} |
| + |
| + @classmethod |
| + def Name(cls): |
| + return 'memory.long_running_dual_browser_test' |
| + |
| + @classmethod |
| + def ShouldTearDownStateAfterEachStorySetRun(cls): |
| + return False |
|
perezju
2016/06/24 10:11:08
Note this method does not exist, yet. Will be adde
|
| + |
| + @classmethod |
| + def ValueCanBeAddedPredicate(cls, value, is_first_result): |
| + # TODO(crbug.com/610962): Remove this stopgap when the perf dashboard |
| + # is able to cope with the data load generated by TBMv2 metrics. |
| + return not _IGNORED_STATS_RE.search(value.name) |
| + |
| + |
| # TODO(bashi): Workaround for http://crbug.com/532075 |
| # @benchmark.Enabled('android') shouldn't be needed. |
| @benchmark.Enabled('android') |