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

target: Add new attribute to Target to indicate a container

Browse Source 
Allow for a flag to be set to indicate that the target is a container
and therefore may have limited functionality.
This commit is contained in:
Marc Bonnici 2018-06-29 16:01:43 +01:00 committed by setrofim
parent 8aa9d672a1
commit e16c42fe2c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devlib/target.py
View File

@ -173,6 +173,7 @@ class Target(object):
load_default_modules=True, load_default_modules=True,
shell_prompt=DEFAULT_SHELL_PROMPT, shell_prompt=DEFAULT_SHELL_PROMPT,
conn_cls=None, conn_cls=None,
is_container=False
): ):
self._connected_as_root = None self._connected_as_root = None
self.connection_settings = connection_settings or {} self.connection_settings = connection_settings or {}
@ -198,6 +199,7 @@ class Target(object):
self.load_default_modules = load_default_modules self.load_default_modules = load_default_modules
self.shell_prompt = bytes_regex(shell_prompt) self.shell_prompt = bytes_regex(shell_prompt)
self.conn_cls = conn_cls self.conn_cls = conn_cls
self.is_container = is_container
self.logger = logging.getLogger(self.__class__.__name__) self.logger = logging.getLogger(self.__class__.__name__)
self._installed_binaries = {} self._installed_binaries = {}
self._installed_modules = {} self._installed_modules = {}
@ -835,6 +837,7 @@ class LinuxTarget(Target):
load_default_modules=True, load_default_modules=True,
shell_prompt=DEFAULT_SHELL_PROMPT, shell_prompt=DEFAULT_SHELL_PROMPT,
conn_cls=SshConnection, conn_cls=SshConnection,
is_container=False,
): ):
super(LinuxTarget, self).__init__(connection_settings=connection_settings, super(LinuxTarget, self).__init__(connection_settings=connection_settings,
platform=platform, platform=platform,
@ -844,7 +847,8 @@ class LinuxTarget(Target):
modules=modules, modules=modules,
load_default_modules=load_default_modules, load_default_modules=load_default_modules,
shell_prompt=shell_prompt, shell_prompt=shell_prompt,
conn_cls=conn_cls) conn_cls=conn_cls,
is_container=is_container)
def wait_boot_complete(self, timeout=10): def wait_boot_complete(self, timeout=10):
pass pass
@ -1028,6 +1032,7 @@ class AndroidTarget(Target):
shell_prompt=DEFAULT_SHELL_PROMPT, shell_prompt=DEFAULT_SHELL_PROMPT,
conn_cls=AdbConnection, conn_cls=AdbConnection,
package_data_directory="/data/data", package_data_directory="/data/data",
is_container=False,
): ):
super(AndroidTarget, self).__init__(connection_settings=connection_settings, super(AndroidTarget, self).__init__(connection_settings=connection_settings,
platform=platform, platform=platform,
@ -1037,7 +1042,8 @@ class AndroidTarget(Target):
modules=modules, modules=modules,
load_default_modules=load_default_modules, load_default_modules=load_default_modules,
shell_prompt=shell_prompt, shell_prompt=shell_prompt,
conn_cls=conn_cls) conn_cls=conn_cls,
is_container=is_container)
self.package_data_directory = package_data_directory self.package_data_directory = package_data_directory
self.clear_logcat_lock = threading.Lock() self.clear_logcat_lock = threading.Lock()
@ -1743,6 +1749,7 @@ class LocalLinuxTarget(LinuxTarget):
load_default_modules=True, load_default_modules=True,
shell_prompt=DEFAULT_SHELL_PROMPT, shell_prompt=DEFAULT_SHELL_PROMPT,
conn_cls=LocalConnection, conn_cls=LocalConnection,
is_container=False,
): ):
super(LocalLinuxTarget, self).__init__(connection_settings=connection_settings, super(LocalLinuxTarget, self).__init__(connection_settings=connection_settings,
platform=platform, platform=platform,
@ -1752,7 +1759,8 @@ class LocalLinuxTarget(LinuxTarget):
modules=modules, modules=modules,
load_default_modules=load_default_modules, load_default_modules=load_default_modules,
shell_prompt=shell_prompt, shell_prompt=shell_prompt,
conn_cls=conn_cls) conn_cls=conn_cls,
is_container=is_container)
def _resolve_paths(self): def _resolve_paths(self):
if self.working_directory is None: if self.working_directory is None:
@ -1824,6 +1832,7 @@ class ChromeOsTarget(LinuxTarget):
load_default_modules=True, load_default_modules=True,
shell_prompt=DEFAULT_SHELL_PROMPT, shell_prompt=DEFAULT_SHELL_PROMPT,
package_data_directory="/data/data", package_data_directory="/data/data",
is_container=False
): ):
self.supports_android = None self.supports_android = None
@ -1845,7 +1854,8 @@ class ChromeOsTarget(LinuxTarget):
modules=modules, modules=modules,
load_default_modules=load_default_modules, load_default_modules=load_default_modules,
shell_prompt=shell_prompt, shell_prompt=shell_prompt,
conn_cls=SshConnection) conn_cls=SshConnection,
is_container=is_container)
# We can't determine if the target supports android until connected to the linux host so # We can't determine if the target supports android until connected to the linux host so
# create unconditionally. # create unconditionally.
@ -1869,7 +1879,8 @@ class ChromeOsTarget(LinuxTarget):
load_default_modules=False, load_default_modules=False,
shell_prompt=shell_prompt, shell_prompt=shell_prompt,
conn_cls=AdbConnection, conn_cls=AdbConnection,
package_data_directory=package_data_directory) package_data_directory=package_data_directory,
is_container=True)
if connect: if connect:
self.connect() self.connect()