sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-21 20:38:57 +00:00
Code Issues Releases Wiki Activity

framework/workload: ApkWorkload consistent package handling

Browse Source 
Rename "package" parameter to "package_name" (to be cosnsitent with
package_names class attribute). "package" is now a property containting
the name of the actual package used after the APK is resolved.
This commit is contained in:
Sergei Trofimov 2017-09-15 13:45:56 +01:00
parent 1e233d2104
commit fe53efcd49
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wa/framework/workload.py
View File

@ -107,9 +107,9 @@ class ApkWorkload(Workload):
package_names = [] package_names = []
parameters = [ parameters = [
Parameter('package', kind=str, Parameter('package_name', kind=str,
description=""" description="""
The pacakge name that can be used to specify The package name that can be used to specify
the workload apk to use. the workload apk to use.
"""), """),
Parameter('install_timeout', kind=int, Parameter('install_timeout', kind=int,
@ -153,10 +153,14 @@ class ApkWorkload(Workload):
""") """)
] ]
@property
def package(self):
return self.apk.package
def __init__(self, target, **kwargs): def __init__(self, target, **kwargs):
super(ApkWorkload, self).__init__(target, **kwargs) super(ApkWorkload, self).__init__(target, **kwargs)
self.apk = PackageHandler(self, self.apk = PackageHandler(self,
package=self.package, package_name=self.package_name,
variant=self.variant, variant=self.variant,
strict=self.strict, strict=self.strict,
version=self.version, version=self.version,
@ -429,8 +433,14 @@ class ReventGUI(object):
class PackageHandler(object): class PackageHandler(object):
@property
def package(self):
if self.apk_info is None:
return None
return self.apk_info.package
def __init__(self, owner, install_timeout=300, version=None, variant=None, def __init__(self, owner, install_timeout=300, version=None, variant=None,
package=None, strict=False, force_install=False, uninstall=False, package_name=None, strict=False, force_install=False, uninstall=False,
exact_abi=False): exact_abi=False):
self.logger = logging.getLogger('apk') self.logger = logging.getLogger('apk')
self.owner = owner self.owner = owner
@ -438,7 +448,7 @@ class PackageHandler(object):
self.install_timeout = install_timeout self.install_timeout = install_timeout
self.version = version self.version = version
self.variant = variant self.variant = variant
self.package = package self.package_name = package_name
self.strict = strict self.strict = strict
self.force_install = force_install self.force_install = force_install
self.uninstall = uninstall self.uninstall = uninstall
@ -462,7 +472,7 @@ class PackageHandler(object):
self.apk_file = context.resolver.get(ApkFile(self.owner, self.apk_file = context.resolver.get(ApkFile(self.owner,
variant=self.variant, variant=self.variant,
version=self.version, version=self.version,
package=self.package, package=self.package_name,
exact_abi=self.exact_abi, exact_abi=self.exact_abi,
supported_abi=self.supported_abi), supported_abi=self.supported_abi),
strict=self.strict) strict=self.strict)
@ -471,19 +481,19 @@ class PackageHandler(object):
if self.version: if self.version:
installed_version = self.target.get_package_version(self.apk_info.package) installed_version = self.target.get_package_version(self.apk_info.package)
host_version = self.apk_info.version_name host_version = self.apk_info.version_name
if (installed_version != host_version and if (installed_version and installed_version != host_version and
loose_version_matching(self.version, installed_version)): loose_version_matching(self.version, installed_version)):
msg = 'Multiple matching packages found for {}; host version: {}, device version: {}' msg = 'Multiple matching packages found for {}; host version: {}, device version: {}'
raise WorkloadError(msg.format(self.owner, host_version, installed_version)) raise WorkloadError(msg.format(self.owner, host_version, installed_version))
else: else:
if not self.owner.package_names and not self.package: if not self.owner.package_names and not self.package_name:
msg = 'No package name(s) specified and no matching APK file found on host' msg = 'No package name(s) specified and no matching APK file found on host'
raise WorkloadError(msg) raise WorkloadError(msg)
self.resolve_package_from_target(context) self.resolve_package_from_target(context)
def resolve_package_from_target(self, context): def resolve_package_from_target(self, context):
if self.package: if self.package_name:
if not self.target.package_is_installed(self.package): if not self.target.package_is_installed(self.package_name):
msg = 'Package "{}" cannot be found on the host or device' msg = 'Package "{}" cannot be found on the host or device'
raise WorkloadError(msg.format(self.package_name)) raise WorkloadError(msg.format(self.package_name))
else: else:
@ -496,23 +506,23 @@ class PackageHandler(object):
for package in installed_versions: for package in installed_versions:
package_version = self.target.get_package_version(package) package_version = self.target.get_package_version(package)
if loose_version_matching(self.version, package_version): if loose_version_matching(self.version, package_version):
self.package = package self.package_name = package
break break
else: else:
if len(installed_versions) == 1: if len(installed_versions) == 1:
self.package = installed_versions[0] self.package_name = installed_versions[0]
else: else:
msg = 'Package version not set and multiple versions found on device' msg = 'Package version not set and multiple versions found on device'
raise WorkloadError(msg) raise WorkloadError(msg)
if not self.package: if not self.package_name:
raise WorkloadError('No matching package found') raise WorkloadError('No matching package found')
self.pull_apk(self.package) self.pull_apk(self.package_name)
self.apk_file = context.resolver.get(ApkFile(self.owner, self.apk_file = context.resolver.get(ApkFile(self.owner,
variant=self.variant, variant=self.variant,
version=self.version, version=self.version,
package=self.package), package=self.package_name),
strict=self.strict) strict=self.strict)
self.apk_info = ApkInfo(self.apk_file) self.apk_info = ApkInfo(self.apk_file)