OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 cloud_storage_test_base | 5 import cloud_storage_test_base |
6 import gpu_rasterization_expectations | 6 import gpu_rasterization_expectations |
7 import optparse | 7 import optparse |
8 import page_sets | 8 import page_sets |
9 | 9 |
10 from telemetry.util import image_util | 10 from telemetry.util import image_util |
(...skipping 14 matching lines...) Expand all Loading... |
25 } | 25 } |
26 | 26 |
27 window.domAutomationController = domAutomationController; | 27 window.domAutomationController = domAutomationController; |
28 """ | 28 """ |
29 | 29 |
30 def _DidTestSucceed(tab): | 30 def _DidTestSucceed(tab): |
31 return tab.EvaluateJavaScript('domAutomationController._succeeded') | 31 return tab.EvaluateJavaScript('domAutomationController._succeeded') |
32 | 32 |
33 class GpuRasterizationValidator(cloud_storage_test_base.ValidatorBase): | 33 class GpuRasterizationValidator(cloud_storage_test_base.ValidatorBase): |
34 def CustomizeBrowserOptions(self, options): | 34 def CustomizeBrowserOptions(self, options): |
| 35 # --test-type=gpu is used only to suppress the "Google API Keys are missing" |
| 36 # infobar, which causes flakiness in tests. |
35 options.AppendExtraBrowserArgs(['--enable-threaded-compositing', | 37 options.AppendExtraBrowserArgs(['--enable-threaded-compositing', |
36 '--enable-impl-side-painting', | 38 '--enable-impl-side-painting', |
37 '--force-gpu-rasterization', | 39 '--force-gpu-rasterization', |
38 '--enable-gpu-benchmarking']) | 40 '--enable-gpu-benchmarking', |
| 41 '--test-type=gpu']) |
39 | 42 |
40 def ValidateAndMeasurePage(self, page, tab, results): | 43 def ValidateAndMeasurePage(self, page, tab, results): |
41 if not _DidTestSucceed(tab): | 44 if not _DidTestSucceed(tab): |
42 raise page_test.Failure('Page indicated a failure') | 45 raise page_test.Failure('Page indicated a failure') |
43 | 46 |
44 if not hasattr(page, 'expectations') or not page.expectations: | 47 if not hasattr(page, 'expectations') or not page.expectations: |
45 raise page_test.Failure('Expectations not specified') | 48 raise page_test.Failure('Expectations not specified') |
46 | 49 |
47 if not tab.screenshot_supported: | 50 if not tab.screenshot_supported: |
48 raise page_test.Failure('Browser does not support screenshot capture') | 51 raise page_test.Failure('Browser does not support screenshot capture') |
(...skipping 24 matching lines...) Expand all Loading... |
73 return 'gpu_rasterization' | 76 return 'gpu_rasterization' |
74 | 77 |
75 def CreateStorySet(self, options): | 78 def CreateStorySet(self, options): |
76 story_set = page_sets.GpuRasterizationTestsStorySet(self.GetExpectations()) | 79 story_set = page_sets.GpuRasterizationTestsStorySet(self.GetExpectations()) |
77 for page in story_set: | 80 for page in story_set: |
78 page.script_to_evaluate_on_commit = test_harness_script | 81 page.script_to_evaluate_on_commit = test_harness_script |
79 return story_set | 82 return story_set |
80 | 83 |
81 def _CreateExpectations(self): | 84 def _CreateExpectations(self): |
82 return gpu_rasterization_expectations.GpuRasterizationExpectations() | 85 return gpu_rasterization_expectations.GpuRasterizationExpectations() |
OLD | NEW |