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

Side by Side Diff: content/test/gpu/gpu_tests/memory_test.py

Issue 560153004: Telemetry: Fix exact_matches in telemetry.test_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move memory.py to memory_test.py to make the autogenerated name match the buildbot config Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 import memory_expectations 4 import memory_test_expectations
5 import page_sets 5 import page_sets
6 6
7 from telemetry import benchmark 7 from telemetry import benchmark
8 from telemetry.page import page_test 8 from telemetry.page import page_test
9 from telemetry.core.platform import tracing_category_filter 9 from telemetry.core.platform import tracing_category_filter
10 from telemetry.core.platform import tracing_options 10 from telemetry.core.platform import tracing_options
11 from telemetry.timeline import counter 11 from telemetry.timeline import counter
12 from telemetry.timeline import model 12 from telemetry.timeline import model
13 13
14 MEMORY_LIMIT_MB = 192 14 MEMORY_LIMIT_MB = 192
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 for c in custom_categories: 92 for c in custom_categories:
93 category_filter.AddIncludedCategory(c) 93 category_filter.AddIncludedCategory(c)
94 options = tracing_options.TracingOptions() 94 options = tracing_options.TracingOptions()
95 options.enable_chrome_trace = True 95 options.enable_chrome_trace = True
96 tab.browser.platform.tracing_controller.Start(options, category_filter, 60) 96 tab.browser.platform.tracing_controller.Start(options, category_filter, 60)
97 97
98 def _FormatException(self, low_or_high, mb_used): 98 def _FormatException(self, low_or_high, mb_used):
99 return 'Memory allocation too %s (was %d MB, should be %d MB +/- %d MB)' % ( 99 return 'Memory allocation too %s (was %d MB, should be %d MB +/- %d MB)' % (
100 low_or_high, mb_used, SINGLE_TAB_LIMIT_MB, WIGGLE_ROOM_MB) 100 low_or_high, mb_used, SINGLE_TAB_LIMIT_MB, WIGGLE_ROOM_MB)
101 101
102 class Memory(benchmark.Benchmark): 102 class MemoryTest(benchmark.Benchmark):
103 """Tests GPU memory limits""" 103 """Tests GPU memory limits"""
104 test = _MemoryValidator 104 test = _MemoryValidator
105 page_set = page_sets.MemoryTestsPageSet
106 105
107 def CreateExpectations(self, page_set): 106 def CreateExpectations(self, page_set):
108 return memory_expectations.MemoryExpectations() 107 return memory_test_expectations.MemoryTestExpectations()
109 108
110 def CreatePageSet(self, options): 109 def CreatePageSet(self, options):
111 page_set = super(Memory, self).CreatePageSet(options) 110 page_set = page_sets.MemoryTestsPageSet()
112 for page in page_set.pages: 111 for page in page_set.pages:
113 page.script_to_evaluate_on_commit = test_harness_script 112 page.script_to_evaluate_on_commit = test_harness_script
114 return page_set 113 return page_set
OLDNEW
« no previous file with comments | « content/test/gpu/gpu_tests/memory_expectations.py ('k') | content/test/gpu/gpu_tests/memory_test_expectations.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698