| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Runs all ChromeDriver end to end tests.""" | 6 """Runs all ChromeDriver end to end tests.""" |
| 7 | 7 |
| 8 import optparse | 8 import optparse |
| 9 import os | 9 import os |
| 10 import sys | 10 import sys |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 code1 = RunPythonTests(chromedriver, | 146 code1 = RunPythonTests(chromedriver, |
| 147 android_package=options.android_package) | 147 android_package=options.android_package) |
| 148 code2 = RunJavaTests(chromedriver_server, | 148 code2 = RunJavaTests(chromedriver_server, |
| 149 android_package=options.android_package) | 149 android_package=options.android_package) |
| 150 return code1 or code2 | 150 return code1 or code2 |
| 151 else: | 151 else: |
| 152 latest_snapshot_revision = archive.GetLatestRevision(archive.Site.SNAPSHOT) | 152 latest_snapshot_revision = archive.GetLatestRevision(archive.Site.SNAPSHOT) |
| 153 versions = [ | 153 versions = [ |
| 154 ['HEAD', latest_snapshot_revision], | 154 ['HEAD', latest_snapshot_revision], |
| 155 ['28', archive.CHROME_28_REVISION], | 155 ['28', archive.CHROME_28_REVISION], |
| 156 ['27', archive.CHROME_27_REVISION], | 156 ['27', archive.CHROME_27_REVISION] |
| 157 ['26', archive.CHROME_26_REVISION] | |
| 158 ] | 157 ] |
| 159 code = 0 | 158 code = 0 |
| 160 for version in versions: | 159 for version in versions: |
| 161 if options.chrome_version and version[0] != options.chrome_version: | 160 if options.chrome_version and version[0] != options.chrome_version: |
| 162 continue | 161 continue |
| 163 download_site = archive.Site.CONTINUOUS | 162 download_site = archive.Site.CONTINUOUS |
| 164 version_name = version[0] | 163 version_name = version[0] |
| 165 if version_name == 'HEAD': | 164 if version_name == 'HEAD': |
| 166 version_name = version[1] | 165 version_name = version[1] |
| 167 download_site = archive.Site.SNAPSHOT | 166 download_site = archive.Site.SNAPSHOT |
| 168 chrome_path = archive.DownloadChrome(version[1], | 167 chrome_path = archive.DownloadChrome(version[1], |
| 169 util.MakeTempDir(), | 168 util.MakeTempDir(), |
| 170 download_site) | 169 download_site) |
| 171 code1 = RunPythonTests(chromedriver, chrome=chrome_path, | 170 code1 = RunPythonTests(chromedriver, chrome=chrome_path, |
| 172 chrome_version=version[0], | 171 chrome_version=version[0], |
| 173 chrome_version_name=version_name) | 172 chrome_version_name=version_name) |
| 174 code2 = RunJavaTests(chromedriver_server, chrome=chrome_path, | 173 code2 = RunJavaTests(chromedriver_server, chrome=chrome_path, |
| 175 chrome_version=version[0], | 174 chrome_version=version[0], |
| 176 chrome_version_name=version_name) | 175 chrome_version_name=version_name) |
| 177 code = code or code1 or code2 | 176 code = code or code1 or code2 |
| 178 cpp_tests = os.path.join(build_dir, cpp_tests_name) | 177 cpp_tests = os.path.join(build_dir, cpp_tests_name) |
| 179 return RunCppTests(cpp_tests) or code | 178 return RunCppTests(cpp_tests) or code |
| 180 | 179 |
| 181 | 180 |
| 182 if __name__ == '__main__': | 181 if __name__ == '__main__': |
| 183 sys.exit(main()) | 182 sys.exit(main()) |
| OLD | NEW |