sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-22 12:58:36 +00:00
Code Issues Releases Wiki Activity

fw/workload: Fix installed apk info

Browse Source 
Fix an issue where AndroidWorkload.pull_apk would sometimes get the
wrong package if the desired package name is a substring of another
package name. Rather than using a regex to match the package name, use
the new get_package_info method to match the name exactly.
This commit is contained in:
Sascha Bischoff 2018-03-15 16:35:45 +00:00 committed by Marc Bonnici
parent 758abedd1f
commit dd7ff641f3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wa/framework/workload.py
View File

@ -780,9 +780,8 @@ class PackageHandler(object):
if not self.target.package_is_installed(package): if not self.target.package_is_installed(package):
message = 'Cannot retrieve "{}" as not installed on Target' message = 'Cannot retrieve "{}" as not installed on Target'
raise WorkloadError(message.format(package)) raise WorkloadError(message.format(package))
package_info = self.target.execute('pm list packages -f {}'.format(package)) package_info = self.target.get_package_info(package)
apk_path = re.match('package:(.*)={}'.format(package), package_info).group(1) self.target.pull(package_info.apk_path, self.owner.dependencies_directory)
self.target.pull(apk_path, self.owner.dependencies_directory)
def teardown(self): def teardown(self):
self.target.execute('am force-stop {}'.format(self.apk_info.package)) self.target.execute('am force-stop {}'.format(self.apk_info.package))