Skip to content

Move sigint tests into subprocesses #20907

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
jklymak merged 6 commits into from
Oct 1, 2021
Merged

Move sigint tests into subprocesses #20907

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
886157f
TST: add pyqt on appveyor
tacaswell Aug 24, 2021
2974f3c
Move sigint tests into subprocesses.
QuLogic Aug 26, 2021
df09043
Ensure test_fig_sigint_override cleans up global state.
QuLogic Aug 26, 2021
9e84366
FIX: try @vdrhtc to fix ctrl-c on windows
tacaswell Sep 15, 2021
9d13e7d
TST: fix ctrl-c tests on windows
tacaswell Sep 16, 2021
e13caa4
DOC: add note about why reading the socket is complicated
tacaswell Sep 30, 2021
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
Prev Previous commit
Next Next commit
TST: fix ctrl-c tests on windows
  • Loading branch information
@tacaswell @QuLogic
tacaswell authored and QuLogic committed Sep 22, 2021
commit 9d13e7d14f864dbb3b5ea35f74d02f649596ac0d
41 changes: 25 additions & 16 deletions lib/matplotlib/tests/test_backend_qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ def test_fig_close():
assert init_figs == Gcf.figs


class InterruptiblePopen(subprocess.Popen):
class WaitForStringPopen(subprocess.Popen):
"""
A Popen that passes flags that allow triggering KeyboardInterrupt.
"""

def __init__(self, *args, **kwargs):
if sys.platform == 'win32':
kwargs['creationflags'] = subprocess.CREATE_NEW_PROCESS_GROUP
kwargs['creationflags'] = subprocess.CREATE_NEW_CONSOLE
super().__init__(
*args, **kwargs,
# Force Agg so that each test can switch to its desired Qt backend.
Expand All @@ -80,25 +80,35 @@ def wait_for(self, terminator):
if buf.endswith(terminator):
return

def interrupt(self):
"""Interrupt process in a platform-specific way."""
if sys.platform == 'win32':
self.send_signal(signal.CTRL_C_EVENT)
else:
self.send_signal(signal.SIGINT)


def _test_sigint_impl(backend, target_name, kwargs):
import sys
import matplotlib.pyplot as plt
import os
import threading

plt.switch_backend(backend)
from matplotlib.backends.qt_compat import QtCore

target_name)
def interupter():
if sys.platform == 'win32':
import win32api
win32api.GenerateConsoleCtrlEvent(0, 0)
else:
import signal
os.kill(os.getpid(), signal.SIGINT)

target_name)
timer = threading.Timer(1, interupter)
fig = plt.figure()
fig.canvas.mpl_connect('draw_event',
lambda *args: print('DRAW', flush=True))
fig.canvas.mpl_connect(
'draw_event',
lambda *args: print('DRAW', flush=True)
)
fig.canvas.mpl_connect(
'draw_event',
lambda *args: timer.start()
)
try:
target(**kwargs)
except KeyboardInterrupt:
Expand All @@ -112,13 +122,12 @@ def _test_sigint_impl(backend, target_name, kwargs):
])
def test_sigint(target, kwargs):
backend = plt.get_backend()
proc = InterruptiblePopen(
proc = WaitForStringPopen(
[sys.executable, "-c",
inspect.getsource(_test_sigint_impl) +
f"\n_test_sigint_impl({backend!r}, {target!r}, {kwargs!r})"])
try:
proc.wait_for('DRAW')
proc.interrupt()
stdout, _ = proc.communicate(timeout=_test_timeout)
except:
proc.kill()
Expand Down Expand Up @@ -164,7 +173,7 @@ def custom_signal_handler(signum, frame):
])
def test_other_signal_before_sigint(target, kwargs):
backend = plt.get_backend()
proc = InterruptiblePopen(
proc = WaitForStringPopen(
[sys.executable, "-c",
inspect.getsource(_test_other_signal_before_sigint_impl) +
"\n_test_other_signal_before_sigint_impl("
Expand All @@ -173,7 +182,7 @@ def test_other_signal_before_sigint(target, kwargs):
proc.wait_for('DRAW')
os.kill(proc.pid, signal.SIGUSR1)
proc.wait_for('SIGUSR1')
proc.interrupt()
os.kill(proc.pid, signal.SIGINT)
stdout, _ = proc.communicate(timeout=_test_timeout)
except:
proc.kill()
Expand Down