Chromium Code Reviews| 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 from gpu_tests import cloud_storage_test_base | 5 from gpu_tests import cloud_storage_test_base |
| 6 from gpu_tests import gpu_rasterization_expectations | 6 from gpu_tests import gpu_rasterization_expectations |
| 7 import page_sets | 7 import page_sets |
| 8 | 8 |
| 9 from telemetry.page import page_test | 9 from telemetry.page import page_test |
| 10 from telemetry.util import image_util | 10 from telemetry.util import image_util |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 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" | 35 # --test-type=gpu is used only to suppress the "Google API Keys are missing" |
| 36 # infobar, which causes flakiness in tests. | 36 # infobar, which causes flakiness in tests. |
| 37 options.AppendExtraBrowserArgs(['--enable-threaded-compositing', | 37 options.AppendExtraBrowserArgs(['--enable-threaded-compositing', |
|
danakj
2016/09/26 21:39:29
I think this should go away too
wkorman
2016/09/26 21:44:29
Are you sure? It looks like this still ties to som
danakj
2016/09/26 21:46:06
In layout tests we disable threaded compositing un
Ken Russell (switch to Gerrit)
2016/09/26 21:48:57
+1 for removing it then. Thanks danakj@ for pointi
wkorman
2016/09/26 22:18:54
Done.
| |
| 38 '--enable-impl-side-painting', | |
| 39 '--force-gpu-rasterization', | 38 '--force-gpu-rasterization', |
| 40 '--enable-gpu-benchmarking', | 39 '--enable-gpu-benchmarking', |
| 41 '--test-type=gpu']) | 40 '--test-type=gpu']) |
| 42 | 41 |
| 43 def ValidateAndMeasurePage(self, page, tab, results): | 42 def ValidateAndMeasurePage(self, page, tab, results): |
| 44 if not _DidTestSucceed(tab): | 43 if not _DidTestSucceed(tab): |
| 45 raise page_test.Failure('Page indicated a failure') | 44 raise page_test.Failure('Page indicated a failure') |
| 46 | 45 |
| 47 if not hasattr(page, 'expectations') or not page.expectations: | 46 if not hasattr(page, 'expectations') or not page.expectations: |
| 48 raise page_test.Failure('Expectations not specified') | 47 raise page_test.Failure('Expectations not specified') |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 return 'gpu_rasterization' | 79 return 'gpu_rasterization' |
| 81 | 80 |
| 82 def CreateStorySet(self, options): | 81 def CreateStorySet(self, options): |
| 83 story_set = page_sets.GpuRasterizationTestsStorySet(self.GetExpectations()) | 82 story_set = page_sets.GpuRasterizationTestsStorySet(self.GetExpectations()) |
| 84 for page in story_set: | 83 for page in story_set: |
| 85 page.script_to_evaluate_on_commit = test_harness_script | 84 page.script_to_evaluate_on_commit = test_harness_script |
| 86 return story_set | 85 return story_set |
| 87 | 86 |
| 88 def _CreateExpectations(self): | 87 def _CreateExpectations(self): |
| 89 return gpu_rasterization_expectations.GpuRasterizationExpectations() | 88 return gpu_rasterization_expectations.GpuRasterizationExpectations() |
| OLD | NEW |