mirror of
https://github.com/python/cpython.git
synced 2025-11-24 20:30:18 +00:00
[3.14] gh-139391: properly handle signal.signal() in UnixConsole when called from a non-main thread (GH-139392) (#139858)
gh-139391: properly handle `signal.signal()` in `UnixConsole` when called from a non-main thread (GH-139392)
(cherry picked from commit b8c8b8f1d3)
Co-authored-by: yihong <zouzou0208@gmail.com>
This commit is contained in:
parent
de87549eb8
commit
8761d6e644
3 changed files with 22 additions and 2 deletions
|
|
@ -4,11 +4,12 @@ import os
|
|||
import signal
|
||||
import subprocess
|
||||
import sys
|
||||
import threading
|
||||
import unittest
|
||||
from functools import partial
|
||||
from test import support
|
||||
from test.support import os_helper, force_not_colorized_test_class
|
||||
from test.support import script_helper
|
||||
from test.support import script_helper, threading_helper
|
||||
|
||||
from unittest import TestCase
|
||||
from unittest.mock import MagicMock, call, patch, ANY, Mock
|
||||
|
|
@ -318,6 +319,17 @@ class TestConsole(TestCase):
|
|||
console.prepare() # needed to call restore()
|
||||
console.restore() # this should succeed
|
||||
|
||||
@threading_helper.reap_threads
|
||||
@threading_helper.requires_working_threading()
|
||||
def test_restore_in_thread(self, _os_write):
|
||||
# gh-139391: ensure that console.restore() silently suppresses
|
||||
# exceptions when calling signal.signal() from a non-main thread.
|
||||
console = unix_console([])
|
||||
console.old_sigwinch = signal.SIG_DFL
|
||||
thread = threading.Thread(target=console.restore)
|
||||
thread.start()
|
||||
thread.join() # this should not raise
|
||||
|
||||
|
||||
@unittest.skipIf(sys.platform == "win32", "No Unix console on Windows")
|
||||
class TestUnixConsoleEIOHandling(TestCase):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue