sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-07 13:41:24 +00:00
Code Issues Releases Wiki Activity

Add check_app_version method to ApkWorkload

Browse Source 
Implement new method to enforce that a valid apk version is used to run
the workload. Based on a min and max range of apk versions tested
during development.
This commit is contained in:
John Richardson 2016-09-01 16:35:43 +01:00
parent b5c0bdb0eb
commit 1986511ae8
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,8 @@ import sys
import time import time
from math import ceil from math import ceil
from distutils.version import LooseVersion
from wlauto.core.extension import Parameter, ExtensionMeta, ListCollection from wlauto.core.extension import Parameter, ExtensionMeta, ListCollection
from wlauto.core.workload import Workload from wlauto.core.workload import Workload
from wlauto.core.resource import NO_ONE from wlauto.core.resource import NO_ONE
@ -140,6 +142,9 @@ class ApkWorkload(Workload):
so, as with all timeouts, so leeway must be included in so, as with all timeouts, so leeway must be included in
the specified value. the specified value.
:min_apk_version: The minimum supported apk version for this workload. May be ``None``.
:max_apk_version: The maximum supported apk version for this workload. May be ``None``.
.. note:: Both package and activity for a workload may be obtained from the APK using .. note:: Both package and activity for a workload may be obtained from the APK using
the ``aapt`` tool that comes with the ADT (Android Developemnt Tools) bundle. the ``aapt`` tool that comes with the ADT (Android Developemnt Tools) bundle.
@ -147,6 +152,8 @@ class ApkWorkload(Workload):
package = None package = None
activity = None activity = None
view = None view = None
min_apk_version = None
max_apk_version = None
supported_platforms = ['android'] supported_platforms = ['android']
parameters = [ parameters = [
@ -194,6 +201,13 @@ class ApkWorkload(Workload):
raise ConfigError('force_install cannot be "True" when check_apk is set to "False".') raise ConfigError('force_install cannot be "True" when check_apk is set to "False".')
self.initialize_package(context) self.initialize_package(context)
# Check the APK version against the min and max versions compatible
# with the workload before launching the package. Note: must be called
# after initialize_package() to get self.apk_version.
if self.check_apk:
self.check_apk_version()
self.launch_package() self.launch_package()
self.device.execute('am kill-all') # kill all *background* activities self.device.execute('am kill-all') # kill all *background* activities
self.device.clear_logcat() self.device.clear_logcat()
@ -243,6 +257,17 @@ class ApkWorkload(Workload):
self.apk_version = installed_version self.apk_version = installed_version
self.reset(context) self.reset(context)
def check_apk_version(self):
if self.min_apk_version:
if LooseVersion(self.apk_version) < LooseVersion(self.min_apk_version):
message = "APK version not supported. Minimum version required: {}"
raise WorkloadError(message.format(self.min_apk_version))
if self.max_apk_version:
if LooseVersion(self.apk_version) > LooseVersion(self.max_apk_version):
message = "APK version not supported. Maximum version supported: {}"
raise WorkloadError(message.format(self.max_apk_version))
def launch_package(self): def launch_package(self):
if not self.activity: if not self.activity:
output = self.device.execute('am start -W {}'.format(self.package)) output = self.device.execute('am start -W {}'.format(self.package))