sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-04-06 01:40:04 +01:00
Code Issues Releases Wiki Activity

Merge pull request #146 from derkling/adb_addons

Browse Source 
Add a couple of ADB related utility functions
This commit is contained in:
setrofim 2017-07-12 13:20:53 +01:00 committed by GitHub
commit b933dbda67
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devlib/target.py
View File

@ -909,8 +909,16 @@ class AndroidTarget(Target):
pass pass
self._connected_as_root = None self._connected_as_root = None
def connect(self, timeout=10, check_boot_completed=True): # pylint: disable=arguments-differ def wait_boot_complete(self, timeout=10):
start = time.time() start = time.time()
boot_completed = boolean(self.getprop('sys.boot_completed'))
while not boot_completed and timeout >= time.time() - start:
time.sleep(5)
boot_completed = boolean(self.getprop('sys.boot_completed'))
if not boot_completed:
raise TargetError('Connected but Android did not fully boot.')
def connect(self, timeout=10, check_boot_completed=True): # pylint: disable=arguments-differ
device = self.connection_settings.get('device') device = self.connection_settings.get('device')
if device and ':' in device: if device and ':' in device:
# ADB does not automatically remove a network device from it's # ADB does not automatically remove a network device from it's
@ -922,12 +930,7 @@ class AndroidTarget(Target):
super(AndroidTarget, self).connect(timeout=timeout) super(AndroidTarget, self).connect(timeout=timeout)
if check_boot_completed: if check_boot_completed:
boot_completed = boolean(self.getprop('sys.boot_completed')) self.wait_boot_complete(timeout)
while not boot_completed and timeout >= time.time() - start:
time.sleep(5)
boot_completed = boolean(self.getprop('sys.boot_completed'))
if not boot_completed:
raise TargetError('Connected but Android did not fully boot.')
def setup(self, executables=None): def setup(self, executables=None):
super(AndroidTarget, self).setup(executables) super(AndroidTarget, self).setup(executables)
@ -1120,6 +1123,12 @@ class AndroidTarget(Target):
def clear_logcat(self): def clear_logcat(self):
adb_command(self.adb_name, 'logcat -c', timeout=30) adb_command(self.adb_name, 'logcat -c', timeout=30)
def adb_kill_server(self, timeout=30):
adb_command(self.adb_name, 'kill-server', timeout)
def adb_wait_for_device(self, timeout=30):
adb_command(self.adb_name, 'wait-for-device', timeout)
def adb_reboot_bootloader(self, timeout=30): def adb_reboot_bootloader(self, timeout=30):
adb_command(self.adb_name, 'reboot-bootloader', timeout) adb_command(self.adb_name, 'reboot-bootloader', timeout)