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

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

Issue 2663813003: Roll out framework change & update gpu tests to conform to the API changes (Closed)
Patch Set: Roll DEPS to 42d9cffaa797712c58d7b5fb59820f0aa3e82138 Created 3 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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 4
5 import os 5 import os
6 import sys 6 import sys
7 7
8 from gpu_tests import gpu_integration_test 8 from gpu_tests import gpu_integration_test
9 from gpu_tests import path_util 9 from gpu_tests import path_util
10 from gpu_tests import pixel_test_pages 10 from gpu_tests import pixel_test_pages
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 self.fail(self._FormatException(category_name)) 113 self.fail(self._FormatException(category_name))
114 114
115 def _FormatException(self, category): 115 def _FormatException(self, category):
116 return 'Trace markers for GPU category were not found: %s' % category 116 return 'Trace markers for GPU category were not found: %s' % category
117 117
118 @classmethod 118 @classmethod
119 def _CreateExpectations(cls): 119 def _CreateExpectations(cls):
120 return trace_test_expectations.TraceTestExpectations() 120 return trace_test_expectations.TraceTestExpectations()
121 121
122 @classmethod 122 @classmethod
123 def setUpClass(cls): 123 def SetUpProcess(cls):
124 super(cls, TraceIntegrationTest).setUpClass() 124 super(cls, TraceIntegrationTest).SetUpProcess()
125 path_util.SetupTelemetryPaths() 125 path_util.SetupTelemetryPaths()
126 cls.CustomizeOptions() 126 cls.CustomizeOptions()
127 cls.SetBrowserOptions(cls._finder_options) 127 cls.SetBrowserOptions(cls._finder_options)
128 cls.StartBrowser() 128 cls.StartBrowser()
129 cls.SetStaticServerDirs([data_path]) 129 cls.SetStaticServerDirs([data_path])
130 130
131 def load_tests(loader, tests, pattern): 131 def load_tests(loader, tests, pattern):
132 del loader, tests, pattern # Unused. 132 del loader, tests, pattern # Unused.
133 return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__]) 133 return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698