| 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 pipes | 9 import pipes |
| 10 import re | 10 import re |
| (...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1103 os.remove(report) | 1103 os.remove(report) |
| 1104 """, | 1104 """, |
| 1105 args=[self.m.path['checkout'].join('out', | 1105 args=[self.m.path['checkout'].join('out', |
| 1106 self.m.chromium.c.BUILD_CONFIG, | 1106 self.m.chromium.c.BUILD_CONFIG, |
| 1107 'test_logs', | 1107 'test_logs', |
| 1108 '*.log')], | 1108 '*.log')], |
| 1109 ) | 1109 ) |
| 1110 | 1110 |
| 1111 def common_tests_setup_steps(self, perf_setup=False, | 1111 def common_tests_setup_steps(self, perf_setup=False, |
| 1112 remove_system_webview=False, skip_wipe=False): | 1112 remove_system_webview=False, skip_wipe=False): |
| 1113 if self.c.use_devil_adb: |
| 1114 self.use_devil_adb() |
| 1113 self.create_adb_symlink() | 1115 self.create_adb_symlink() |
| 1114 self.spawn_logcat_monitor() | 1116 self.spawn_logcat_monitor() |
| 1115 self.spawn_device_monitor() | 1117 self.spawn_device_monitor() |
| 1116 self.authorize_adb_devices() | 1118 self.authorize_adb_devices() |
| 1117 # TODO(jbudorick): Restart USB only on perf bots while we | 1119 # TODO(jbudorick): Restart USB only on perf bots while we |
| 1118 # figure out the fate of the usb reset in general. | 1120 # figure out the fate of the usb reset in general. |
| 1119 self.device_recovery(restart_usb=perf_setup) | 1121 self.device_recovery(restart_usb=perf_setup) |
| 1120 if perf_setup: | 1122 if perf_setup: |
| 1121 kwargs = { | 1123 kwargs = { |
| 1122 'min_battery_level': 95, | 1124 'min_battery_level': 95, |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1584 script = self.c.test_runner | 1586 script = self.c.test_runner |
| 1585 if wrapper_script_suite_name: | 1587 if wrapper_script_suite_name: |
| 1586 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1588 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1587 wrapper_script_suite_name) | 1589 wrapper_script_suite_name) |
| 1588 else: | 1590 else: |
| 1589 env = kwargs.get('env', {}) | 1591 env = kwargs.get('env', {}) |
| 1590 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1592 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1591 self.m.chromium.output_dir) | 1593 self.m.chromium.output_dir) |
| 1592 kwargs['env'] = env | 1594 kwargs['env'] = env |
| 1593 return self.m.python(step_name, script, args, **kwargs) | 1595 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |