| OLD | NEW |
| 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 logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 from gpu_tests import gpu_integration_test | 9 from gpu_tests import gpu_integration_test |
| 10 from gpu_tests import path_util | 10 from gpu_tests import path_util |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 extension=extension, context_type=context_type) | 248 extension=extension, context_type=context_type) |
| 249 self._CheckTestCompletion() | 249 self._CheckTestCompletion() |
| 250 | 250 |
| 251 @classmethod | 251 @classmethod |
| 252 def CustomizeOptions(cls): | 252 def CustomizeOptions(cls): |
| 253 assert cls._webgl_version == 1 or cls._webgl_version == 2 | 253 assert cls._webgl_version == 1 or cls._webgl_version == 2 |
| 254 browser_options = cls._finder_options.browser_options | 254 browser_options = cls._finder_options.browser_options |
| 255 # --test-type=gpu is used only to suppress the "Google API Keys are missing" | 255 # --test-type=gpu is used only to suppress the "Google API Keys are missing" |
| 256 # infobar, which causes flakiness in tests. | 256 # infobar, which causes flakiness in tests. |
| 257 browser_options.AppendExtraBrowserArgs([ | 257 browser_options.AppendExtraBrowserArgs([ |
| 258 '--ignore-autoplay-restrictions', | 258 '--disable-gesture-requirement-for-media-playback', |
| 259 '--disable-domain-blocking-for-3d-apis', | 259 '--disable-domain-blocking-for-3d-apis', |
| 260 '--disable-gpu-process-crash-limit', | 260 '--disable-gpu-process-crash-limit', |
| 261 '--test-type=gpu', | 261 '--test-type=gpu', |
| 262 '--enable-experimental-canvas-features', | 262 '--enable-experimental-canvas-features', |
| 263 # Try disabling the GPU watchdog to see if this affects the | 263 # Try disabling the GPU watchdog to see if this affects the |
| 264 # intermittent GPU process hangs that have been seen on the | 264 # intermittent GPU process hangs that have been seen on the |
| 265 # waterfall. crbug.com/596622 crbug.com/609252 | 265 # waterfall. crbug.com/596622 crbug.com/609252 |
| 266 '--disable-gpu-watchdog' | 266 '--disable-gpu-watchdog' |
| 267 ]) | 267 ]) |
| 268 | 268 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 if webgl_version > 1: | 396 if webgl_version > 1: |
| 397 test += '?webglVersion=' + str(webgl_version) | 397 test += '?webglVersion=' + str(webgl_version) |
| 398 test_paths.append(test) | 398 test_paths.append(test) |
| 399 | 399 |
| 400 return test_paths | 400 return test_paths |
| 401 | 401 |
| 402 | 402 |
| 403 def load_tests(loader, tests, pattern): | 403 def load_tests(loader, tests, pattern): |
| 404 del loader, tests, pattern # Unused. | 404 del loader, tests, pattern # Unused. |
| 405 return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__]) | 405 return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__]) |
| OLD | NEW |