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

Revert "ResourceGetters: Added support for finding uiautoapk files."

Browse Source 
This reverts commit b948d28c6296cbeb57060d66415f3948887feced.
This commit is contained in:
Marc Bonnici 2017-06-05 13:20:45 +01:00
parent bf694ffdf1
commit 4ce38fcd55
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wlauto/resource_getters/standard.py
View File

@ -122,11 +122,6 @@ class PackageApkGetter(PackageFileGetter):
return get_from_location_by_extension(resource, resource_dir, self.extension, version, variant=variant)
class PackageUiautoApkGetter(PackageApkGetter):
name = 'uiautoapk'
extension = 'uiautoapk'
class PackageJarGetter(PackageFileGetter):
name = 'package_jar'
extension = 'jar'
@ -412,7 +407,7 @@ class HttpGetter(ResourceGetter):
assets = self.index.get(resource.owner.name, {})
if not assets:
return {}
if resource.name in ['apk', 'jar', 'uiautoapk']:
if resource.name in ['apk', 'jar']:
paths = [a['path'] for a in assets]
version = getattr(resource, 'version', None)
found = get_from_list_by_extension(resource, paths, resource.name, version)
@ -457,7 +452,7 @@ class RemoteFilerGetter(ResourceGetter):
"""
priority = GetterPriority.remote
resource_type = ['apk', 'file', 'jar', 'revent', 'uiautoapk']
resource_type = ['apk', 'file', 'jar', 'revent']
parameters = [
Parameter('remote_path', global_alias='remote_assets_path', default='',
@ -505,7 +500,7 @@ class RemoteFilerGetter(ResourceGetter):
def get_from(self, resource, version, location): # pylint: disable=no-self-use
# pylint: disable=too-many-branches
if resource.name in ['apk', 'jar', 'uiautoapk']:
if resource.name in ['apk', 'jar']:
return get_from_location_by_extension(resource, location, resource.name, version)
elif resource.name == 'file':
filepath = os.path.join(location, resource.path)
@ -562,11 +557,11 @@ def get_from_list_by_extension(resource, filelist, extension, version=None, vari
if variant:
filelist = [ff for ff in filelist if variant.lower() in os.path.basename(ff).lower()]
if version:
if extension in ['apk', 'uiautoapk']:
if extension == 'apk':
filelist = [ff for ff in filelist if version.lower() in ApkInfo(ff).version_name.lower()]
else:
filelist = [ff for ff in filelist if version.lower() in os.path.basename(ff).lower()]
if extension in ['apk', 'uiautoapk']:
if extension == 'apk':
filelist = [ff for ff in filelist if not ApkInfo(ff).native_code or resource.platform in ApkInfo(ff).native_code]
if len(filelist) == 1:
return filelist[0]