sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-19 12:24:32 +00:00
Code Issues Releases Wiki Activity

Properly replace APK during adb install

Browse Source 
Issue: For certain installation errors, it is possible for WA to
 incorrectly report that an APK was reinstalled while it actually
 wasn't, leading to bugs later on in the run.

Fix:
 - Add the '-r' flag to adb install when reinstalling, to make sure
   APK is replaced.
 - Add '-g' flag for API 23 and higher, to grant all permissions that
   would otherwise be requested at runtime (similar to pre-API 23)
This commit is contained in:
muendelezaji 2016-06-21 14:21:03 +01:00
parent 25dd6b71f3
commit fab6a977aa
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wlauto/common/android/device.py
View File

@ -349,18 +349,24 @@ class AndroidDevice(BaseLinuxDevice): # pylint: disable=W0223
timeout=self.default_timeout) timeout=self.default_timeout)
return bool(int(output)) return bool(int(output))
def install(self, filepath, timeout=default_timeout, with_name=None): # pylint: disable=W0221 def install(self, filepath, timeout=default_timeout, with_name=None, replace=False): # pylint: disable=W0221
ext = os.path.splitext(filepath)[1].lower() ext = os.path.splitext(filepath)[1].lower()
if ext == '.apk': if ext == '.apk':
return self.install_apk(filepath, timeout) return self.install_apk(filepath, timeout, replace)
else: else:
return self.install_executable(filepath, with_name) return self.install_executable(filepath, with_name)
def install_apk(self, filepath, timeout=default_timeout): # pylint: disable=W0221 def install_apk(self, filepath, timeout=default_timeout, replace=False): # pylint: disable=W0221
self._check_ready() self._check_ready()
ext = os.path.splitext(filepath)[1].lower() ext = os.path.splitext(filepath)[1].lower()
if ext == '.apk': if ext == '.apk':
return adb_command(self.adb_name, "install '{}'".format(filepath), timeout=timeout) flags = []
if replace:
flags.append('-r') # Replace existing APK
if self.get_sdk_version() >= 23:
flags.append('-g') # Grant all runtime permissions
self.logger.debug("Replace APK = {}, ADB flags = '{}'".format(replace, ' '.join(flags)))
return adb_command(self.adb_name, "install {} '{}'".format(' '.join(flags), filepath), timeout=timeout)
else: else:
raise DeviceError('Can\'t install {}: unsupported format.'.format(filepath)) raise DeviceError('Can\'t install {}: unsupported format.'.format(filepath))

15
wlauto/common/android/workload.py
View File

@ -155,8 +155,8 @@ class ApkWorkload(Workload):
'''), '''),
Parameter('force_install', kind=boolean, default=False, Parameter('force_install', kind=boolean, default=False,
description=''' description='''
Always re-install the APK, even if matching version is found Always re-install the APK, even if matching version is found already installed
on already installed on the device. on the device. Runs ``adb install -r`` to ensure existing APK is replaced.
'''), '''),
Parameter('uninstall_apk', kind=boolean, default=False, Parameter('uninstall_apk', kind=boolean, default=False,
description='If ``True``, will uninstall workload\'s APK as part of teardown.'), description='If ``True``, will uninstall workload\'s APK as part of teardown.'),
@ -194,7 +194,7 @@ class ApkWorkload(Workload):
self.initialize_with_host_apk(context, installed_version) self.initialize_with_host_apk(context, installed_version)
else: else:
if not installed_version: if not installed_version:
message = '''{} not found found on the device and check_apk is set to "False" message = '''{} not found on the device and check_apk is set to "False"
so host version was not checked.''' so host version was not checked.'''
raise WorkloadError(message.format(self.package)) raise WorkloadError(message.format(self.package))
message = 'Version {} installed on device; skipping host APK check.' message = 'Version {} installed on device; skipping host APK check.'
@ -222,8 +222,8 @@ class ApkWorkload(Workload):
if self.force_install: if self.force_install:
if installed_version: if installed_version:
self.device.uninstall(self.package) self.device.uninstall(self.package)
# It's possible that that the uninstall above fails, which will result in # It's possible that the uninstall above fails, which might result in a warning
# install failing and a warning, hower execution would the proceed, so need # and/or failure during installation. Hower execution should proceed, so need
# to make sure that the right apk_vesion is reported in the end. # to make sure that the right apk_vesion is reported in the end.
if self.install_apk(context): if self.install_apk(context):
self.apk_version = host_version self.apk_version = host_version
@ -249,12 +249,13 @@ class ApkWorkload(Workload):
# As of android API level 23, apps can request permissions at runtime, # As of android API level 23, apps can request permissions at runtime,
# this will grant all of them so requests do not pop up when running the app # this will grant all of them so requests do not pop up when running the app
# This can also be done less "manually" during adb install using the -g flag
if self.device.get_sdk_version() >= 23: if self.device.get_sdk_version() >= 23:
self._grant_requested_permissions() self._grant_requested_permissions()
def install_apk(self, context): def install_apk(self, context):
success = False success = False
output = self.device.install(self.apk_file, self.install_timeout) output = self.device.install(self.apk_file, self.install_timeout, replace=self.force_install)
if 'Failure' in output: if 'Failure' in output:
if 'ALREADY_EXISTS' in output: if 'ALREADY_EXISTS' in output:
self.logger.warn('Using already installed APK (did not unistall properly?)') self.logger.warn('Using already installed APK (did not unistall properly?)')
@ -288,7 +289,7 @@ class ApkWorkload(Workload):
self.device.execute("pm grant {} {}".format(self.package, permission)) self.device.execute("pm grant {} {}".format(self.package, permission))
def do_post_install(self, context): def do_post_install(self, context):
""" May be overwritten by dervied classes.""" """ May be overwritten by derived classes."""
pass pass
def run(self, context): def run(self, context):