OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 | 2 |
3 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 3 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
4 # for details. All rights reserved. Use of this source code is governed by a | 4 # for details. All rights reserved. Use of this source code is governed by a |
5 # BSD-style license that can be found in the LICENSE file. | 5 # BSD-style license that can be found in the LICENSE file. |
6 | 6 |
7 import datetime | 7 import datetime |
8 import math | 8 import math |
9 import optparse | 9 import optparse |
10 import os | 10 import os |
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
836 for loc in path: | 836 for loc in path: |
837 if 'depot_tools' in loc: | 837 if 'depot_tools' in loc: |
838 if browser == 'chrome': | 838 if browser == 'chrome': |
839 if os.path.exists(orig_chromedriver_path): | 839 if os.path.exists(orig_chromedriver_path): |
840 MoveChromedriver(loc) | 840 MoveChromedriver(loc) |
841 elif browser == 'dartium': | 841 elif browser == 'dartium': |
842 if (int(self.test.test_runner.current_revision_num) < | 842 if (int(self.test.test_runner.current_revision_num) < |
843 FIRST_CHROMEDRIVER): | 843 FIRST_CHROMEDRIVER): |
844 # If we don't have a stashed a different chromedriver just use | 844 # If we don't have a stashed a different chromedriver just use |
845 # the regular chromedriver. | 845 # the regular chromedriver. |
846 self.test.test_runner.RunCmd(os.path.join( | 846 self.test.test_runner.RunCmd([os.path.join( |
847 TOP_LEVEL_DIR, 'tools', 'testing', 'webdriver_test_setup.py'), | 847 TOP_LEVEL_DIR, 'tools', 'testing', 'webdriver_test_setup.py'), |
848 '-f', '-s', '-p') | 848 '-f', '-p', '-s']) |
849 elif not os.path.exists(dartium_chromedriver_path): | 849 elif not os.path.exists(dartium_chromedriver_path): |
850 stdout, _ = self.test.test_runner.GetArchive('chromedriver') | 850 stdout, _ = self.test.test_runner.GetArchive('chromedriver') |
851 # Move original chromedriver for storage. | 851 # Move original chromedriver for storage. |
852 if not os.path.exists(orig_chromedriver_path): | 852 if not os.path.exists(orig_chromedriver_path): |
853 MoveChromedriver(loc, copy_to_depot_tools_dir=False) | 853 MoveChromedriver(loc, copy_to_depot_tools_dir=False) |
854 if self.test.test_runner.current_revision_num >= FIRST_CHROMEDRIVER: | 854 if self.test.test_runner.current_revision_num >= FIRST_CHROMEDRIVER: |
855 # Copy Dartium chromedriver into depot_tools | 855 # Copy Dartium chromedriver into depot_tools |
856 MoveChromedriver(loc, from_path=os.path.join( | 856 MoveChromedriver(loc, from_path=os.path.join( |
857 dartium_chromedriver_path, 'chromedriver')) | 857 dartium_chromedriver_path, 'chromedriver')) |
858 os.chdir(current_dir) | 858 os.chdir(current_dir) |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1117 else: | 1117 else: |
1118 if runner.backfill: | 1118 if runner.backfill: |
1119 results_set = FillInBackHistory(results_set, runner) | 1119 results_set = FillInBackHistory(results_set, runner) |
1120 else: | 1120 else: |
1121 time.sleep(200) | 1121 time.sleep(200) |
1122 else: | 1122 else: |
1123 runner.RunTestSequence() | 1123 runner.RunTestSequence() |
1124 | 1124 |
1125 if __name__ == '__main__': | 1125 if __name__ == '__main__': |
1126 main() | 1126 main() |
OLD | NEW |