Skip to content

Commit

Permalink
[7.4.x] fix for ValueError raised in faulthandler teardown code (#11455)
Browse files Browse the repository at this point in the history
Co-authored-by: Simon Blanchard <[email protected]>
  • Loading branch information
github-actions[bot] and bnomis authored Sep 20, 2023
1 parent f8bb857 commit 21fe071
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ Serhii Mozghovyi
Seth Junot
Shantanu Jain
Shubham Adep
Simon Blanchard
Simon Gomizelj
Simon Holesch
Simon Kerr
Expand Down
1 change: 1 addition & 0 deletions changelog/11439.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Handle an edge case where :data:`sys.stderr` might already be closed when :ref:`faulthandler` is tearing down.
3 changes: 1 addition & 2 deletions src/_pytest/faulthandler.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import io
import os
import sys
from typing import Generator
Expand Down Expand Up @@ -51,7 +50,7 @@ def get_stderr_fileno() -> int:
if fileno == -1:
raise AttributeError()
return fileno
except (AttributeError, io.UnsupportedOperation):
except (AttributeError, ValueError):
# pytest-xdist monkeypatches sys.stderr with an object that is not an actual file.
# https://docs.python.org/3/library/faulthandler.html#issue-with-file-descriptors
# This is potentially dangerous, but the best we can do.
Expand Down

0 comments on commit 21fe071

Please sign in to comment.