diff mbox series

[RFC,v2,12/12] oeqa/selftest/cases/spdx: change test for spdx3

Message ID 20231031224733.367227-13-louis.rannou@syslinbit.com
State New
Headers show
Series SPDX3 Proof-of-Concept | expand

Commit Message

Louis Rannou Oct. 31, 2023, 10:47 p.m. UTC 
fix issue in selftest due to spdx bump

Signed-off-by: Louis Rannou <louis.rannou@syslinbit.com>
---
 meta/lib/oeqa/selftest/cases/spdx.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
diff mbox series

Patch

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)