[PATCH 15/23] oeqa/core/decorators/data: improve has_* logic

Ross Burton
2022-03-31T18:29:25Z

has_feature() should be splitting the feature string into substrings and
then looking for membership instead of looking for simple substrings.

has_machine() should be using equality instead of substrings.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/lib/oeqa/core/decorator/data.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oeqa/core/decorator/data.py b/meta/lib/oeqa/core/decorator/data.py
index bc4939e87c5..12197be246e 100644
--- a/meta/lib/oeqa/core/decorator/data.py
+++ b/meta/lib/oeqa/core/decorator/data.py
@@ -13,8 +13,8 @@ def has_feature(td, feature):
Checks for feature in DISTRO_FEATURES or IMAGE_FEATURES.
"""

- if (feature in td.get('DISTRO_FEATURES', '') or
- feature in td.get('IMAGE_FEATURES', '')):
+ if (feature in td.get('DISTRO_FEATURES', '').split() or
+ feature in td.get('IMAGE_FEATURES', '').split()):
return True
return False

@@ -23,7 +23,7 @@ def has_machine(td, machine):
Checks for MACHINE.
"""

- if (machine in td.get('MACHINE', '')):
+ if (machine == td.get('MACHINE', '')):
return True
return False

--
2.25.1