| 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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 'file format is compatible') | 361 'file format is compatible') |
| 362 | 362 |
| 363 def device_status_check(self, restart_usb=False, **kwargs): | 363 def device_status_check(self, restart_usb=False, **kwargs): |
| 364 # TODO(bpastene): Remove once chromium revisions prior to | 364 # TODO(bpastene): Remove once chromium revisions prior to |
| 365 # crrev.com/1faecde0c03013b6cd725da413339c60223f8948 are no longer tested. | 365 # crrev.com/1faecde0c03013b6cd725da413339c60223f8948 are no longer tested. |
| 366 # See crbug.com/619707 for context. | 366 # See crbug.com/619707 for context. |
| 367 self.revert_device_file_format() | 367 self.revert_device_file_format() |
| 368 self.device_recovery() | 368 self.device_recovery() |
| 369 return self.device_status() | 369 return self.device_status() |
| 370 | 370 |
| 371 def host_info(self, args=[], **kwargs): | 371 def host_info(self, args=None, **kwargs): |
| 372 args = args or [] |
| 372 results = None | 373 results = None |
| 373 try: | 374 try: |
| 374 with self.handle_exit_codes(): | 375 with self.handle_exit_codes(): |
| 375 if self.known_devices_file: | 376 if self.known_devices_file: |
| 376 known_devices_arg = ['--known-devices-file', self.known_devices_file] | 377 known_devices_arg = ['--known-devices-file', self.known_devices_file] |
| 377 args.extend(['--args', self.m.json.input(known_devices_arg)]) | 378 args.extend(['--args', self.m.json.input(known_devices_arg)]) |
| 378 args.extend(['run', '--output', self.m.json.output()]) | 379 args.extend(['run', '--output', self.m.json.output()]) |
| 379 results = self.m.step( | 380 results = self.m.step( |
| 380 'Host Info', | 381 'Host Info', |
| 381 [self.m.path['checkout'].join('testing', 'scripts', | 382 [self.m.path['checkout'].join('testing', 'scripts', |
| (...skipping 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1492 script = self.c.test_runner | 1493 script = self.c.test_runner |
| 1493 if wrapper_script_suite_name: | 1494 if wrapper_script_suite_name: |
| 1494 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1495 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1495 wrapper_script_suite_name) | 1496 wrapper_script_suite_name) |
| 1496 else: | 1497 else: |
| 1497 env = kwargs.get('env', {}) | 1498 env = kwargs.get('env', {}) |
| 1498 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1499 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1499 self.m.chromium.output_dir) | 1500 self.m.chromium.output_dir) |
| 1500 kwargs['env'] = env | 1501 kwargs['env'] = env |
| 1501 return self.m.python(step_name, script, args, **kwargs) | 1502 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |