| 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 sys | 10 import sys |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 # crrev.com/1faecde0c03013b6cd725da413339c60223f8948 are no longer tested. | 367 # crrev.com/1faecde0c03013b6cd725da413339c60223f8948 are no longer tested. |
| 368 # See crbug.com/619707 for context. | 368 # See crbug.com/619707 for context. |
| 369 self.revert_device_file_format() | 369 self.revert_device_file_format() |
| 370 self.device_recovery() | 370 self.device_recovery() |
| 371 return self.device_status() | 371 return self.device_status() |
| 372 | 372 |
| 373 def host_info(self, args=[], **kwargs): | 373 def host_info(self, args=[], **kwargs): |
| 374 results = None | 374 results = None |
| 375 try: | 375 try: |
| 376 with self.handle_exit_codes(): | 376 with self.handle_exit_codes(): |
| 377 if self.known_devices_file: |
| 378 known_devices_arg = ['--known-devices-path', self.known_devices_file] |
| 379 args.extend(['--args', self.m.json.input(known_devices_arg)]) |
| 377 args.extend(['run', '--output', self.m.json.output()]) | 380 args.extend(['run', '--output', self.m.json.output()]) |
| 378 results = self.m.step( | 381 results = self.m.step( |
| 379 'Host Info', | 382 'Host Info', |
| 380 [self.m.path['checkout'].join('testing', 'scripts', | 383 [self.m.path['checkout'].join('testing', 'scripts', |
| 381 'host_info.py')] + args, | 384 'host_info.py')] + args, |
| 382 env=self.m.chromium.get_env(), | 385 env=self.m.chromium.get_env(), |
| 383 infra_step=True, | 386 infra_step=True, |
| 384 step_test_data=lambda: self.m.json.test_api.output({ | 387 step_test_data=lambda: self.m.json.test_api.output({ |
| 385 'valid': True, | 388 'valid': True, |
| 386 'failures': [], | 389 'failures': [], |
| (...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1469 script = self.c.test_runner | 1472 script = self.c.test_runner |
| 1470 if wrapper_script_suite_name: | 1473 if wrapper_script_suite_name: |
| 1471 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1474 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1472 wrapper_script_suite_name) | 1475 wrapper_script_suite_name) |
| 1473 else: | 1476 else: |
| 1474 env = kwargs.get('env', {}) | 1477 env = kwargs.get('env', {}) |
| 1475 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1478 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1476 self.m.chromium.output_dir) | 1479 self.m.chromium.output_dir) |
| 1477 kwargs['env'] = env | 1480 kwargs['env'] = env |
| 1478 return self.m.python(step_name, script, args, **kwargs) | 1481 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |