Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@ Version 0.6.5
*************
Release Date xx-xx-xxxx

New Features
############

Improvements
############

- Sequencer logic now handles exceptions raised on sequence abort. GUI will no longer hang when a test raises an exception during a test abort.
- Fix bug where DSOX1202G appeared to hang both the program and scope

*************
Expand Down
22 changes: 15 additions & 7 deletions src/fixate/sequencer.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
from fixate.core.ui import user_retry_abort_fail
from fixate.core.checks import CheckResult
from fixate.reporting import CSVWriter
import logging

logger = logging.getLogger(__name__)

STATUS_STATES = ["Idle", "Running", "Paused", "Finished", "Restart", "Aborted"]

Expand Down Expand Up @@ -219,14 +222,19 @@ def run_sequence(self):
"""
self.reporting_service.install()
self.status = "Running"
try:
self.run_once()
finally:
while self.context:
top = self.context.top()
if isinstance(top.current(), TestList):

self.run_once()

while self.context:
# Test sequence aborted early for some reason
# Run test exit functions
top = self.context.top()
if isinstance(top.current(), TestList):
try:
top.current().exit()
self.context.pop()
except Exception as e:
logger.exception(e)
self.context.pop()

self.reporting_service.uninstall()

Expand Down
Loading
Loading