Previously the target.start exceptions were being
masked by the catch clause of RuntimeError and
BlockingIOError which are very broad. We decoupled
the start method try clause from the runTests try
clause which requires catching the BlockingIOError and
RuntimeError.
Signed-off-by: Paulo Neves <ptsne...@gmail.com>
---
meta/classes/testimage.bbclass | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 2aa59b0..f58d11d 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -269,24 +269,30 @@ def testimage_main(d):
# Add systemd.log_level=debug to enable systemd debug logging
bootparams = 'systemd.log_target=console'
+
tc.target.deploy()
- results = None
- orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception)
+
+ #We do not want the runTests to mask exeptions of target.start but we want
a failed start
+ #to trigger a stop.
try:
- # We need to check if runqemu ends unexpectedly
- # or if the worker send us a SIGTERM
- tc.target.start(extra_bootparams=bootparams)
- results = tc.runTests()
- except (RuntimeError, BlockingIOError) as err:
- if isinstance(err, RuntimeError):
- bb.error('testimage received SIGTERM, shutting down...')
- else:
- bb.error('runqemu failed, shutting down...')
- if results:
- results.stop()
- results = None
+ tc.target.start(extra_bootparams=bootparams)
+ results = None
+ orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception)
+ try:
+ # We need to check if runqemu ends unexpectedly
+ # or if the worker send us a SIGTERM
+ results = tc.runTests()
+ except (RuntimeError, BlockingIOError) as err:
+ if isinstance(err, RuntimeError):
+ bb.error('testimage received SIGTERM, shutting down...')
+ else:
+ bb.error('runqemu failed, shutting down...')
+ if results:
+ results.stop()
+ results = None
+ finally:
+ signal.signal(signal.SIGTERM, orig_sigterm_handler)
finally:
- signal.signal(signal.SIGTERM, orig_sigterm_handler)
tc.target.stop()
# Show results (if we have them)
--
2.7.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
