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

fw/resource: Fix attempting to match against empty values

Browse Source 
Update checking of attributes to allow for empty structures as they can
be set to empty lists etc. and therefore should not be checking if
explicitly `None`.
This commit is contained in:
Marc Bonnici 2019-04-01 17:06:57 +01:00 committed by setrofim
parent 0ec8427d05
commit 2c2118ad23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wa/framework/resource.py
View File

@ -161,13 +161,13 @@ class ApkFile(Resource):
package_matches = True
abi_matches = True
uiauto_matches = uiauto_test_matches(path, self.uiauto)
if self.version is not None:
if self.version:
version_matches = apk_version_matches(path, self.version)
if self.variant is not None:
if self.variant:
name_matches = file_name_matches(path, self.variant)
if self.package is not None:
if self.package:
package_matches = package_name_matches(path, self.package)
if self.supported_abi is not None:
if self.supported_abi:
abi_matches = apk_abi_matches(path, self.supported_abi,
self.exact_abi)
return name_matches and version_matches and \