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

utils/android: Expose connection_attempts argument to AdbConnection

Browse Source 
Allow for configuring the number of connection attempts that will be
made to the device before failing to connect. This allows for waiting longer
periods of time for the device to come online.
This commit is contained in:
Marc Bonnici 2020-05-12 10:04:14 +01:00 committed by setrofim
parent a8ff622f33
commit 45881b9f0d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devlib/utils/android.py
View File

@ -264,7 +264,7 @@ class AdbConnection(ConnectionBase):
# pylint: disable=unused-argument # pylint: disable=unused-argument
def __init__(self, device=None, timeout=None, platform=None, adb_server=None, def __init__(self, device=None, timeout=None, platform=None, adb_server=None,
adb_as_root=False): adb_as_root=False, connection_attempts=MAX_ATTEMPTS):
super().__init__() super().__init__()
self.timeout = timeout if timeout is not None else self.default_timeout self.timeout = timeout if timeout is not None else self.default_timeout
if device is None: if device is None:
@ -274,7 +274,7 @@ class AdbConnection(ConnectionBase):
self.adb_as_root = adb_as_root self.adb_as_root = adb_as_root
if self.adb_as_root: if self.adb_as_root:
self.adb_root(enable=True) self.adb_root(enable=True)
adb_connect(self.device, adb_server=self.adb_server) adb_connect(self.device, adb_server=self.adb_server, attempts=connection_attempts)
AdbConnection.active_connections[self.device] += 1 AdbConnection.active_connections[self.device] += 1
self._setup_ls() self._setup_ls()
self._setup_su() self._setup_su()

5
doc/connection.rst
View File

@ -104,7 +104,7 @@ Connection Types
.. module:: devlib.utils.android .. module:: devlib.utils.android
.. class:: AdbConnection(device=None, timeout=None, adb_server=None, adb_as_root=False) .. class:: AdbConnection(device=None, timeout=None, adb_server=None, adb_as_root=False, connection_attempts=MAX_ATTEMPTS)
A connection to an android device via ``adb`` (Android Debug Bridge). A connection to an android device via ``adb`` (Android Debug Bridge).
``adb`` is part of the Android SDK (though stand-alone versions are also ``adb`` is part of the Android SDK (though stand-alone versions are also
@ -119,6 +119,9 @@ Connection Types
is raised. is raised.
:param adb_server: Allows specifying the address of the adb server to use. :param adb_server: Allows specifying the address of the adb server to use.
:param adb_as_root: Specify whether the adb server should be restarted in root mode. :param adb_as_root: Specify whether the adb server should be restarted in root mode.
:param connection_attempts: Specify how many connection attempts, 10 seconds
apart, should be attempted to connect to the device.
Defaults to 5.
.. module:: devlib.utils.ssh .. module:: devlib.utils.ssh