Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(609)

Side by Side Diff: build/android/pylib/remote/device/remote_device_environment.py

Issue 1128733002: Update from https://crrev.com/328418 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 """Environment setup and teardown for remote devices.""" 5 """Environment setup and teardown for remote devices."""
6 6
7 import distutils.version 7 import distutils.version
8 import json 8 import json
9 import logging 9 import logging
10 import os 10 import os
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 self._api_port = device_json.get('api_port', None) 71 self._api_port = device_json.get('api_port', None)
72 self._api_protocol = device_json.get('api_protocol', None) 72 self._api_protocol = device_json.get('api_protocol', None)
73 self._api_secret = device_json.get('api_secret', None) 73 self._api_secret = device_json.get('api_secret', None)
74 self._device_oem = device_json.get('device_oem', None) 74 self._device_oem = device_json.get('device_oem', None)
75 self._device_type = device_json.get('device_type', 'Android') 75 self._device_type = device_json.get('device_type', 'Android')
76 self._network_config = device_json.get('network_config', None) 76 self._network_config = device_json.get('network_config', None)
77 self._remote_device = device_json.get('remote_device', None) 77 self._remote_device = device_json.get('remote_device', None)
78 self._remote_device_minimum_os = device_json.get( 78 self._remote_device_minimum_os = device_json.get(
79 'remote_device_minimum_os', None) 79 'remote_device_minimum_os', None)
80 self._remote_device_os = device_json.get('remote_device_os', None) 80 self._remote_device_os = device_json.get('remote_device_os', None)
81 self._remote_device_timeout = device_json.get('remote_device_timeout', None) 81 self._remote_device_timeout = device_json.get(
82 'remote_device_timeout', None)
82 self._results_path = device_json.get('results_path', None) 83 self._results_path = device_json.get('results_path', None)
83 self._runner_package = device_json.get('runner_package', None) 84 self._runner_package = device_json.get('runner_package', None)
84 self._runner_type = device_json.get('runner_type', None) 85 self._runner_type = device_json.get('runner_type', None)
85 self._timeouts.update(device_json.get('timeouts', {})) 86 self._timeouts.update(device_json.get('timeouts', {}))
86 87
87 def command_line_override( 88 def command_line_override(
88 file_value, cmd_line_value, desc, print_value=True): 89 file_value, cmd_line_value, desc, print_value=True):
89 if cmd_line_value: 90 if cmd_line_value:
90 if file_value and file_value != cmd_line_value: 91 if file_value and file_value != cmd_line_value:
91 if print_value: 92 if print_value:
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 324
324 @property 325 @property
325 def device_type_id(self): 326 def device_type_id(self):
326 return self._device['device_type_id'] 327 return self._device['device_type_id']
327 328
328 @property 329 @property
329 def network_config(self): 330 def network_config(self):
330 return self._network_config 331 return self._network_config
331 332
332 @property 333 @property
333 def only_output_failures(self):
334 # TODO(jbudorick): Remove this once b/18981674 is fixed.
335 return True
336
337 @property
338 def results_path(self): 334 def results_path(self):
339 return self._results_path 335 return self._results_path
340 336
341 @property 337 @property
342 def runner_package(self): 338 def runner_package(self):
343 return self._runner_package 339 return self._runner_package
344 340
345 @property 341 @property
346 def runner_type(self): 342 def runner_type(self):
347 return self._runner_type 343 return self._runner_type
(...skipping 10 matching lines...) Expand all
358 def trigger(self): 354 def trigger(self):
359 return self._trigger 355 return self._trigger
360 356
361 @property 357 @property
362 def verbose_count(self): 358 def verbose_count(self):
363 return self._verbose_count 359 return self._verbose_count
364 360
365 @property 361 @property
366 def device_type(self): 362 def device_type(self):
367 return self._device_type 363 return self._device_type
OLDNEW
« no previous file with comments | « build/android/pylib/perf/setup.py ('k') | build/android/pylib/remote/device/remote_device_gtest_run.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698