michaelh/zephyr
1
0
Fork 0
Code Releases Activity

fix: twister: quit-on-failure

Browse source 
use public queue methods to clear queue on failure

-s Felix Behnke felixbeiderarbeit@gmail.com

Signed-off-by: Felix Behnke <felixbeiderarbeit@gmail.com>
This commit is contained in:
Felix Behnke 2025-05-08 15:57:30 +02:00 • committed by Benjamin Cabé
commit a045eaebad
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/pylib/twister/twisterlib/runner.py
View file

@ -2003,9 +2003,11 @@ class TwisterRunner:
pb.process(pipeline, done_queue, task, lock, results) pb.process(pipeline, done_queue, task, lock, results)
if self.env.options.quit_on_failure and \ if self.env.options.quit_on_failure and \
pb.instance.status in [TwisterStatus.FAIL, TwisterStatus.ERROR]: pb.instance.status in [TwisterStatus.FAIL, TwisterStatus.ERROR]:
with pipeline.mutex: try:
pipeline.queue.clear() while True:
break pipeline.get_nowait()
except queue.Empty:
pass
return True return True
else: else:
@ -2021,9 +2023,11 @@ class TwisterRunner:
pb.process(pipeline, done_queue, task, lock, results) pb.process(pipeline, done_queue, task, lock, results)
if self.env.options.quit_on_failure and \ if self.env.options.quit_on_failure and \
pb.instance.status in [TwisterStatus.FAIL, TwisterStatus.ERROR]: pb.instance.status in [TwisterStatus.FAIL, TwisterStatus.ERROR]:
with pipeline.mutex: try:
pipeline.queue.clear() while True:
break pipeline.get_nowait()
except queue.Empty:
pass
return True return True
except Exception as e: except Exception as e:
logger.error(f"General exception: {e}\n{traceback.format_exc()}") logger.error(f"General exception: {e}\n{traceback.format_exc()}")