summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2023-09-26 10:43:45 (GMT)
committerGitHub <noreply@github.com>2023-09-26 10:43:45 (GMT)
commit2897142d2ec0930a8991af964c798b68fb6dcadd (patch)
treee36e32b546172d15b3bcb9423debfccae07cedc2 /Lib
parent8ac2085b80eca4d9b2a1093d0a7da020fd12e11a (diff)
downloadcpython-2897142d2ec0930a8991af964c798b68fb6dcadd.zip
cpython-2897142d2ec0930a8991af964c798b68fb6dcadd.tar.gz
cpython-2897142d2ec0930a8991af964c798b68fb6dcadd.tar.bz2
gh-109832: concurrent.futures test_deadlock restores sys.stderr (#109887)
test_error_at_task_unpickle() and test_error_during_result_unpickle_in_result_handler() now restore sys.stderr which is overriden by _raise_error_ignore_stderr().
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_concurrent_futures/test_deadlock.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py
index a76e075..af70254 100644
--- a/Lib/test/test_concurrent_futures/test_deadlock.py
+++ b/Lib/test/test_concurrent_futures/test_deadlock.py
@@ -145,6 +145,9 @@ class ExecutorDeadlockTest:
self._check_crash(BrokenProcessPool, id, ExitAtUnpickle())
def test_error_at_task_unpickle(self):
+ # gh-109832: Restore stderr overriden by _raise_error_ignore_stderr()
+ self.addCleanup(setattr, sys, 'stderr', sys.stderr)
+
# Check problem occurring while unpickling a task on workers
self._check_crash(BrokenProcessPool, id, ErrorAtUnpickle())
@@ -180,6 +183,9 @@ class ExecutorDeadlockTest:
self._check_crash(PicklingError, _return_instance, ErrorAtPickle)
def test_error_during_result_unpickle_in_result_handler(self):
+ # gh-109832: Restore stderr overriden by _raise_error_ignore_stderr()
+ self.addCleanup(setattr, sys, 'stderr', sys.stderr)
+
# Check problem occurring while unpickling a task in
# the result_handler thread
self._check_crash(BrokenProcessPool,