[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core][RFC v2 12/12] oeqa/selftest/cases/spdx: change test for spdx3
From:       "Louis Rannou" <louis.rannou () syslinbit ! com>
Date:       2023-10-31 22:47:33
Message-ID: 20231031224733.367227-13-louis.rannou () syslinbit ! com
[Download RAW message or body]

Content-Transfer-Encoding: quoted-printable

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 --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/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]