diff options
author | Bruno Oliveira <nicoddemus@gmail.com> | 2021-01-20 09:45:58 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-20 09:45:58 -0300 |
commit | bda9ce4e0ffcbeb786101f988bbb51e5f832fcb3 (patch) | |
tree | b776ae9a5aec064ff00fc9d874cdf8e9afcbf29d /src | |
parent | eef2d1a8e268ef727eec8f1c38119ee76cdaebc2 (diff) | |
parent | 9ba1821e9121c3ee49a68b4863cd7ee50de4a5a5 (diff) | |
download | pytest-bda9ce4e0ffcbeb786101f988bbb51e5f832fcb3.tar.gz |
Merge pull request #8250 from daq-tools/fix-twisted-capture
Diffstat (limited to 'src')
-rw-r--r-- | src/_pytest/faulthandler.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/_pytest/faulthandler.py b/src/_pytest/faulthandler.py index d0cc0430c..ff673b5b1 100644 --- a/src/_pytest/faulthandler.py +++ b/src/_pytest/faulthandler.py @@ -69,7 +69,12 @@ class FaultHandlerHooks: @staticmethod def _get_stderr_fileno(): try: - return sys.stderr.fileno() + fileno = sys.stderr.fileno() + # The Twisted Logger will return an invalid file descriptor since it is not backed + # by an FD. So, let's also forward this to the same code path as with pytest-xdist. + if fileno == -1: + raise AttributeError() + return fileno except (AttributeError, io.UnsupportedOperation): # 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 |