[honister][PATCH 28/37] testimage: fix unclosed testdata file
From: Anuj Mittal <hidden>
Date: 2021-10-26 15:59:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Ross Burton <redacted> Signed-off-by: Ross Burton <redacted> Signed-off-by: Richard Purdie <redacted> (cherry picked from commit 0c192a97e3e1c015a48667d6903cc07a8b2620e4) Signed-off-by: Anuj Mittal <redacted> --- meta/classes/testimage.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index a76e773853..4db05a4af4 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass@@ -235,9 +235,10 @@ def testimage_main(d): tdname = "%s.testdata.json" % image_name try: - td = json.load(open(tdname, "r")) - except (FileNotFoundError) as err: - bb.fatal('File %s Not Found. Have you built the image with INHERIT+="testimage" in the conf/local.conf?' % tdname) + with open(tdname, "r") as f: + td = json.load(f) + except FileNotFoundError as err: + bb.fatal('File %s not found (%s).\nHave you built the image with INHERIT += "testimage" in the conf/local.conf?' % (tdname, err)) # Some variables need to be updates (mostly paths) with the # ones of the current environment because some tests require them.
--
2.31.1