fix issue in selftest due to spdx bump
Signed-off-by: Louis Rannou <[email protected]>
---
meta/lib/oeqa/selftest/cases/spdx.py | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/spdx.py
b/meta/lib/oeqa/selftest/cases/spdx.py
index 05fc4e390b..215c3c5365 100644
--- a/meta/lib/oeqa/selftest/cases/spdx.py
+++ b/meta/lib/oeqa/selftest/cases/spdx.py
@@ -41,11 +41,17 @@ INHERIT += "create-spdx"
with open(filename) as f:
report = json.load(f)
self.assertNotEqual(report, None)
- self.assertNotEqual(report["SPDXID"], None)
-
- python = os.path.join(get_bb_var('STAGING_BINDIR',
'python3-spdx-tools-native'), 'nativepython3')
- validator = os.path.join(get_bb_var('STAGING_BINDIR',
'python3-spdx-tools-native'), 'pyspdxtools')
- result = runCmd("{} {} -i {}".format(python, validator, filename))
+ self.assertNotEqual(report["@graph"], None)
+ for e in report["@graph"]:
+ if e["type"] == "SpdxDocument":
+ self.assertNotEqual(e["spdxId"], None)
+ break
+ else:
+ self.assertFalse("SpdxDocument not found")
+
+ # python = os.path.join(get_bb_var('STAGING_BINDIR',
'python3-spdx-tools-native'), 'nativepython3')
+ # validator = os.path.join(get_bb_var('STAGING_BINDIR',
'python3-spdx-tools-native'), 'pyspdxtools')
+ # result = runCmd("{} {} -i {}".format(python, validator,
filename))
self.assertExists(full_file_path)
result = check_spdx_json(full_file_path)
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189888):
https://lists.openembedded.org/g/openembedded-core/message/189888
Mute This Topic: https://lists.openembedded.org/mt/102308614/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
