Commitc2a5cb2

tacaswell

authored and

QuLogic

committed

TST: fix ctrl-c tests on windows

1 parent6abb746 commitc2a5cb2Copy full SHA for c2a5cb2

File tree

2 files changed

+32

-17

lines changed

lib/matplotlib
- backends
  - qt_compat.py
- tests
  - test_backend_qt.py

2 files changed

+32

-17

lines changed

`‎lib/matplotlib/backends/qt_compat.py`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,14 @@ def _maybe_allow_interrupt(qapp):`
`228`	`228`	`rsock.fileno(),_enum('QtCore.QSocketNotifier.Type').Read`
`229`	`229`	`)`
`230`	`230`
	`231`	`+rsock.setblocking(False)`
`231`	`232`	`# Clear the socket to re-arm the notifier.`
`232`		`-sn.activated.connect(lambda*args:rsock.recv(1))`
	`233`	`+@sn.activated.connect`
	`234`	`+def_may_clear_sock(*args):`
	`235`	`+try:`
	`236`	`+rsock.recv(1)`
	`237`	`+exceptBlockingIOError:`
	`238`	`+pass`
`233`	`239`
`234`	`240`	`defhandle(*args):`
`235`	`241`	`nonlocalhandler_args`

`‎lib/matplotlib/tests/test_backend_qt.py`

Lines changed: 25 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,14 @@ def test_fig_close():`
`54`	`54`	`assertinit_figs==Gcf.figs`
`55`	`55`
`56`	`56`
`57`		`-classInterruptiblePopen(subprocess.Popen):`
	`57`	`+classWaitForStringPopen(subprocess.Popen):`
`58`	`58`	`"""`
`59`	`59`	`A Popen that passes flags that allow triggering KeyboardInterrupt.`
`60`	`60`	`"""`
`61`	`61`
`62`	`62`	`def__init__(self,args,*kwargs):`
`63`	`63`	`ifsys.platform=='win32':`
`64`		`-kwargs['creationflags']=subprocess.CREATE_NEW_PROCESS_GROUP`
	`64`	`+kwargs['creationflags']=subprocess.CREATE_NEW_CONSOLE`
`65`	`65`	`super().__init__(`
`66`	`66`	`args,*kwargs,`
`67`	`67`	`# Force Agg so that each test can switch to its desired Qt backend.`
`@@ -80,25 +80,35 @@ def wait_for(self, terminator):`
`80`	`80`	`ifbuf.endswith(terminator):`
`81`	`81`	`return`
`82`	`82`
`83`		`-definterrupt(self):`
`84`		`-"""Interrupt process in a platform-specific way."""`
`85`		`-ifsys.platform=='win32':`
`86`		`-self.send_signal(signal.CTRL_C_EVENT)`
`87`		`-else:`
`88`		`-self.send_signal(signal.SIGINT)`
`89`		`-`
`90`	`83`
`91`	`84`	`def_test_sigint_impl(backend,target_name,kwargs):`
`92`	`85`	`importsys`
`93`	`86`	`importmatplotlib.pyplotasplt`
	`87`	`+importos`
	`88`	`+importthreading`
	`89`	`+`
`94`	`90`	`plt.switch_backend(backend)`
`95`	`91`	`frommatplotlib.backends.qt_compatimportQtCore`
`96`	`92`
`97`		`-target=getattr(plt,target_name)`
	`93`	`+definterupter():`
	`94`	`+ifsys.platform=='win32':`
	`95`	`+importwin32api`
	`96`	`+win32api.GenerateConsoleCtrlEvent(0,0)`
	`97`	`+else:`
	`98`	`+importsignal`
	`99`	`+os.kill(os.getpid(),signal.SIGINT)`
`98`	`100`
	`101`	`+target=getattr(plt,target_name)`
	`102`	`+timer=threading.Timer(1,interupter)`
`99`	`103`	`fig=plt.figure()`
`100`		`-fig.canvas.mpl_connect('draw_event',`
`101`		`-lambda*args:print('DRAW',flush=True))`
	`104`	`+fig.canvas.mpl_connect(`
	`105`	`+'draw_event',`
	`106`	`+lambda*args:print('DRAW',flush=True)`
	`107`	`+ )`
	`108`	`+fig.canvas.mpl_connect(`
	`109`	`+'draw_event',`
	`110`	`+lambda*args:timer.start()`
	`111`	`+ )`
`102`	`112`	`try:`
`103`	`113`	`target(**kwargs)`
`104`	`114`	`exceptKeyboardInterrupt:`
`@@ -112,13 +122,12 @@ def _test_sigint_impl(backend, target_name, kwargs):`
`112`	`122`	`])`
`113`	`123`	`deftest_sigint(target,kwargs):`
`114`	`124`	`backend=plt.get_backend()`
`115`		`-proc=InterruptiblePopen(`
	`125`	`+proc=WaitForStringPopen(`
`116`	`126`	`[sys.executable,"-c",`
`117`	`127`	`inspect.getsource(_test_sigint_impl)+`
`118`	`128`	`f"\n_test_sigint_impl({backend!r},{target!r},{kwargs!r})"])`
`119`	`129`	`try:`
`120`	`130`	`proc.wait_for('DRAW')`
`121`		`-proc.interrupt()`
`122`	`131`	`stdout,_=proc.communicate(timeout=_test_timeout)`
`123`	`132`	`except:`
`124`	`133`	`proc.kill()`
`@@ -164,7 +173,7 @@ def custom_signal_handler(signum, frame):`
`164`	`173`	`])`
`165`	`174`	`deftest_other_signal_before_sigint(target,kwargs):`
`166`	`175`	`backend=plt.get_backend()`
`167`		`-proc=InterruptiblePopen(`
	`176`	`+proc=WaitForStringPopen(`
`168`	`177`	`[sys.executable,"-c",`
`169`	`178`	`inspect.getsource(_test_other_signal_before_sigint_impl)+`
`170`	`179`	`"\n_test_other_signal_before_sigint_impl("`
`@@ -173,7 +182,7 @@ def test_other_signal_before_sigint(target, kwargs):`
`173`	`182`	`proc.wait_for('DRAW')`
`174`	`183`	`os.kill(proc.pid,signal.SIGUSR1)`
`175`	`184`	`proc.wait_for('SIGUSR1')`
`176`		`-proc.interrupt()`
	`185`	`+os.kill(proc.pid,signal.SIGINT)`
`177`	`186`	`stdout,_=proc.communicate(timeout=_test_timeout)`
`178`	`187`	`except:`
`179`	`188`	`proc.kill()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc2a5cb2

File tree

2 files changed

2 files changed

`‎lib/matplotlib/backends/qt_compat.py`

`‎lib/matplotlib/tests/test_backend_qt.py`

0 commit comments