jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10979 from bluetech/faulthandler-no-encoding 

faulthandler: avoid accessing sys.stderr.encoding
This commit is contained in:
Ran Benita 2023-05-10 14:17:54 +03:00 committed by GitHub
parent fd56968f2b aac5d5d08b
commit 271bdf6c23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/_pytest/faulthandler.py
View File

@ -2,7 +2,6 @@ import io
import os import os
import sys import sys
from typing import Generator from typing import Generator
from typing import TextIO
import pytest import pytest
from _pytest.config import Config from _pytest.config import Config
@ -11,7 +10,7 @@ from _pytest.nodes import Item
from _pytest.stash import StashKey from _pytest.stash import StashKey
fault_handler_stderr_key = StashKey[TextIO]() fault_handler_stderr_fd_key = StashKey[int]()
fault_handler_originally_enabled_key = StashKey[bool]() fault_handler_originally_enabled_key = StashKey[bool]()
@ -26,12 +25,9 @@ def pytest_addoption(parser: Parser) -> None:
def pytest_configure(config: Config) -> None: def pytest_configure(config: Config) -> None:
import faulthandler import faulthandler
stderr_fd_copy = os.dup(get_stderr_fileno()) config.stash[fault_handler_stderr_fd_key] = os.dup(get_stderr_fileno())
config.stash[fault_handler_stderr_key] = open(
stderr_fd_copy, "w", encoding=sys.stderr.encoding
)
config.stash[fault_handler_originally_enabled_key] = faulthandler.is_enabled() config.stash[fault_handler_originally_enabled_key] = faulthandler.is_enabled()
faulthandler.enable(file=config.stash[fault_handler_stderr_key]) faulthandler.enable(file=config.stash[fault_handler_stderr_fd_key])
def pytest_unconfigure(config: Config) -> None: def pytest_unconfigure(config: Config) -> None:
@ -39,9 +35,9 @@ def pytest_unconfigure(config: Config) -> None:
faulthandler.disable() faulthandler.disable()
# Close the dup file installed during pytest_configure. # Close the dup file installed during pytest_configure.
if fault_handler_stderr_key in config.stash: if fault_handler_stderr_fd_key in config.stash:
config.stash[fault_handler_stderr_key].close() os.close(config.stash[fault_handler_stderr_fd_key])
del config.stash[fault_handler_stderr_key] del config.stash[fault_handler_stderr_fd_key]
if config.stash.get(fault_handler_originally_enabled_key, False): if config.stash.get(fault_handler_originally_enabled_key, False):
# Re-enable the faulthandler if it was originally enabled. # Re-enable the faulthandler if it was originally enabled.
faulthandler.enable(file=get_stderr_fileno()) faulthandler.enable(file=get_stderr_fileno())
@ -69,10 +65,10 @@ def get_timeout_config_value(config: Config) -> float:
@pytest.hookimpl(hookwrapper=True, trylast=True) @pytest.hookimpl(hookwrapper=True, trylast=True)
def pytest_runtest_protocol(item: Item) -> Generator[None, None, None]: def pytest_runtest_protocol(item: Item) -> Generator[None, None, None]:
timeout = get_timeout_config_value(item.config) timeout = get_timeout_config_value(item.config)
stderr = item.config.stash[fault_handler_stderr_key] if timeout > 0:
if timeout > 0 and stderr is not None:
import faulthandler import faulthandler
stderr = item.config.stash[fault_handler_stderr_fd_key]
faulthandler.dump_traceback_later(timeout, file=stderr) faulthandler.dump_traceback_later(timeout, file=stderr)
try: try:
yield yield