| OLD | NEW |
| 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 from devil.android import device_blacklist |
| 6 from devil.android import device_errors |
| 7 from devil.android import device_utils |
| 8 from devil.android.sdk import adb_wrapper |
| 9 from devil.utils import parallelizer |
| 5 from pylib.base import environment | 10 from pylib.base import environment |
| 6 from pylib.device import adb_wrapper | |
| 7 from pylib.device import device_blacklist | |
| 8 from pylib.device import device_errors | |
| 9 from pylib.device import device_utils | |
| 10 from pylib.utils import parallelizer | |
| 11 | 11 |
| 12 | 12 |
| 13 class LocalDeviceEnvironment(environment.Environment): | 13 class LocalDeviceEnvironment(environment.Environment): |
| 14 | 14 |
| 15 def __init__(self, args, _error_func): | 15 def __init__(self, args, _error_func): |
| 16 super(LocalDeviceEnvironment, self).__init__() | 16 super(LocalDeviceEnvironment, self).__init__() |
| 17 self._blacklist = device_blacklist.Blacklist( | 17 self._blacklist = device_blacklist.Blacklist( |
| 18 args.blacklist_file or device_blacklist.BLACKLIST_JSON) | 18 args.blacklist_file or device_blacklist.BLACKLIST_JSON) |
| 19 self._device_serial = args.test_device | 19 self._device_serial = args.test_device |
| 20 self._devices = [] | 20 self._devices = [] |
| (...skipping 28 matching lines...) Expand all Loading... |
| 49 return self._max_tries | 49 return self._max_tries |
| 50 | 50 |
| 51 @property | 51 @property |
| 52 def tool(self): | 52 def tool(self): |
| 53 return self._tool_name | 53 return self._tool_name |
| 54 | 54 |
| 55 #override | 55 #override |
| 56 def TearDown(self): | 56 def TearDown(self): |
| 57 pass | 57 pass |
| 58 | 58 |
| OLD | NEW |