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: Require package name for package resolution

Browse Source 
Mandate that either a package name is specified or the owner defines
supported package names. This prevents any apk file in the correct
location incorrectly being resolved.
This commit is contained in:
Marc Bonnici 2017-11-23 17:16:16 +00:00 committed by setrofim
parent 49eb40fec7
commit ff529462e0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wa/framework/workload.py
View File

@ -558,6 +558,10 @@ class PackageHandler(object):
self.target.clear_logcat() self.target.clear_logcat()
def resolve_package(self, context): def resolve_package(self, context):
if not self.owner.package_names and not self.package_name:
msg = 'Cannot Resolve package; No package name(s) specified'
raise WorkloadError(msg)
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,
@ -575,9 +579,6 @@ class PackageHandler(object):
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_name:
msg = 'No package name(s) specified and no matching APK file found on host'
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):