| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 from telemetry import test | 4 from telemetry import test |
| 5 from telemetry.page import page_set | 5 from telemetry.page import page_set |
| 6 from webgl_conformance import WebglConformanceValidator | 6 from webgl_conformance import WebglConformanceValidator |
| 7 from webgl_conformance import conformance_harness_script | 7 from webgl_conformance import conformance_harness_script |
| 8 from webgl_conformance import conformance_path | 8 from webgl_conformance import conformance_path |
| 9 | 9 |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 def CreatePageSet(self, options): | 51 def CreatePageSet(self, options): |
| 52 page_set_dict = { | 52 page_set_dict = { |
| 53 'description': 'Test cases for WebGL robustness', | 53 'description': 'Test cases for WebGL robustness', |
| 54 'user_agent_type': 'desktop', | 54 'user_agent_type': 'desktop', |
| 55 'serving_dirs': [''], | 55 'serving_dirs': [''], |
| 56 'pages': [ | 56 'pages': [ |
| 57 { | 57 { |
| 58 'url': 'file:///extra/lots-of-polys-example.html', | 58 'url': 'file:///extra/lots-of-polys-example.html', |
| 59 'script_to_evaluate_on_commit': robustness_harness_script, | 59 'script_to_evaluate_on_commit': robustness_harness_script, |
| 60 'wait_for_javascript_expression': 'webglTestHarness._finished' | 60 'navigate_steps': [ |
| 61 {'action': 'navigate'}, |
| 62 { |
| 63 'action': 'wait', |
| 64 'condition': 'javascript', |
| 65 'javascript': 'webglTestHarness._finished' |
| 66 } |
| 67 ] |
| 61 } | 68 } |
| 62 ] | 69 ] |
| 63 } | 70 } |
| 64 return page_set.PageSet.FromDict(page_set_dict, conformance_path) | 71 return page_set.PageSet.FromDict(page_set_dict, conformance_path) |
| OLD | NEW |