Skip to content

Use default SIGINT handler if no tests are running. #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 6, 2019
Merged

Use default SIGINT handler if no tests are running. #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f6729c
Move signal.signal() registration from package __init__ to Test.execute
glados-verma Sep 5, 2019
fab926c
Revert "Move signal.signal() registration from package __init__ to Te…
glados-verma Sep 5, 2019
4015acc
Use default SIGINT handler if no tests are running.
glados-verma Sep 6, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openhtf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ def get_version():
__version__ = get_version()

# Register signal handler to stop all tests on SIGINT.
signal.signal(signal.SIGINT, Test.handle_sig_int)
Test.DEFAULT_SIGINT_HANDLER = signal.signal(signal.SIGINT, Test.handle_sig_int)
14 changes: 9 additions & 5 deletions openhtf/core/test_descriptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ def PhaseTwo(test):

TEST_INSTANCES = weakref.WeakValueDictionary()
HANDLED_SIGINT_ONCE = False
DEFAULT_SIGINT_HANDLER = None

def __init__(self, *phases, **metadata):
# Some sanity checks on special metadata keys we automatically fill in.
Expand Down Expand Up @@ -228,11 +229,14 @@ def configure(self, **kwargs):
setattr(self._test_options, key, value)

@classmethod
def handle_sig_int(cls, *_):
if cls.TEST_INSTANCES:
_LOG.error('Received SIGINT, stopping all tests.')
for test in cls.TEST_INSTANCES.values():
test.abort_from_sig_int()
def handle_sig_int(cls, signalnum, handler):
if not cls.TEST_INSTANCES:
cls.DEFAULT_SIGINT_HANDLER(signalnum, handler)
return

_LOG.error('Received SIGINT, stopping all tests.')
for test in cls.TEST_INSTANCES.values():
test.abort_from_sig_int()
if not cls.HANDLED_SIGINT_ONCE:
cls.HANDLED_SIGINT_ONCE = True
raise KeyboardInterrupt
Expand Down