| 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 | 4 |
| 5 import contextlib | 5 import contextlib |
| 6 import datetime | 6 import datetime |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import urllib | 10 import urllib |
| (...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 958 'testStopLoading', | 958 'testStopLoading', |
| 959 'testJavascriptInterfaceForClientPopup', | 959 'testJavascriptInterfaceForClientPopup', |
| 960 'testRequestImageRef', | 960 'testRequestImageRef', |
| 961 'testSetDownloadListener', | 961 'testSetDownloadListener', |
| 962 'testSetInitialScale', | 962 'testSetInitialScale', |
| 963 ], | 963 ], |
| 964 # crbug.com/514473 | 964 # crbug.com/514473 |
| 965 'android.webkit.cts.WebViewSslTest': [ | 965 'android.webkit.cts.WebViewSslTest': [ |
| 966 'testSslErrorProceedResponseNotReusedForDifferentHost', | 966 'testSslErrorProceedResponseNotReusedForDifferentHost', |
| 967 ], | 967 ], |
| 968 # crbug.com/594573 |
| 969 'android.webkit.cts.WebChromeClientTest': [ |
| 970 'testOnJsBeforeUnload', |
| 971 ], |
| 968 } | 972 } |
| 969 | 973 |
| 970 cts_base_dir = self.m.path.mkdtemp('cts') | 974 cts_base_dir = self.m.path.mkdtemp('cts') |
| 971 cts_zip_path = cts_base_dir.join(_CTS_FILE_NAME) | 975 cts_zip_path = cts_base_dir.join(_CTS_FILE_NAME) |
| 972 self.m.gsutil.download(name='Download CTS', | 976 self.m.gsutil.download(name='Download CTS', |
| 973 bucket='chromium-cts', | 977 bucket='chromium-cts', |
| 974 source=_CTS_FILE_NAME, | 978 source=_CTS_FILE_NAME, |
| 975 dest=cts_zip_path) | 979 dest=cts_zip_path) |
| 976 | 980 |
| 977 cts_extract_dir = cts_base_dir.join('cts-extracted') | 981 cts_extract_dir = cts_base_dir.join('cts-extracted') |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1235 def test_runner(self, step_name, args=None, **kwargs): | 1239 def test_runner(self, step_name, args=None, **kwargs): |
| 1236 """Wrapper for the python testrunner script. | 1240 """Wrapper for the python testrunner script. |
| 1237 | 1241 |
| 1238 Args: | 1242 Args: |
| 1239 step_name: Name of the step. | 1243 step_name: Name of the step. |
| 1240 args: Testrunner arguments. | 1244 args: Testrunner arguments. |
| 1241 """ | 1245 """ |
| 1242 with self.handle_exit_codes(): | 1246 with self.handle_exit_codes(): |
| 1243 return self.m.python( | 1247 return self.m.python( |
| 1244 step_name, self.c.test_runner, args, **kwargs) | 1248 step_name, self.c.test_runner, args, **kwargs) |
| OLD | NEW |