testimage.bbclass: Fix break introduced with SIGTERM handling
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 testimage.bbclass: Fix break introduced with SIGTERM handling
From: Mariano Lopez <[email protected]>
The SIGTERM introduced another break into runexported test, the handler is in the class TestContext while exporting it will try to convert the singnal handler to JSON, and this will throw an exception.
The SIGTERM handler is not needed in the exported test, so this change will remove the handler before exporting the test. Also when a test is exported the target is not deployed/started anymore, it is not necessary.
[YOCTO #8239]
Signed-off-by Mariano Lopez <[email protected]>
--- meta/classes/testimage.bbclass | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
meta/classes/testimage.bbclass +11 -9
@@ -305,13 +305,15 @@ def testimage_main(d): import traceback bb.fatal("Loading tests failed:\n%s" % traceback.format_exc()) - target.deploy() - try: - target.start() - if export: - exportTests(d,tc) - else: + if export: + signal.signal(signal.SIGTERM, tc.origsigtermhandler) + tc.origsigtermhandler = None + exportTests(d,tc) + else: + target.deploy() + try: + target.start() starttime = time.time() result = runTests(tc) stoptime = time.time()
@@ -324,9 +326,9 @@ def testimage_main(d): bb.plain(msg) else: raise bb.build.FuncFailed("%s - FAILED - check the task log and the ssh log" % pn ) - finally: - signal.signal(signal.SIGTERM, tc.origsigtermhandler) - target.stop() + finally: + signal.signal(signal.SIGTERM, tc.origsigtermhandler) + target.stop() testimage_main[vardepsexclude] =+ "BB_ORIGENV"
Signature · 1 line
1.8.4.5