-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
fix: guard FDCapture.snap() against prematurely closed tmpfile #14531
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
RonnyPfannschmidt
wants to merge
1
commit into
pytest-dev:main
Choose a base branch
from
RonnyPfannschmidt:fix/14528-capture-closed-tmpfile
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+59
−0
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Fixed ``ValueError: I/O operation on closed file`` crash during capture teardown when the underlying temporary file has been prematurely closed (e.g. by Python 3.14's incremental garbage collector). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1129,6 +1129,40 @@ def test_capfd_sys_stdout_mode(self, capfd) -> None: | |||||
| assert "b" not in sys.stdout.mode | ||||||
|
|
||||||
|
|
||||||
| class TestFDCaptureClosedTmpfile: | ||||||
| """Regression tests for #14528: snap() on a prematurely closed tmpfile.""" | ||||||
|
|
||||||
| @pytest.fixture | ||||||
| def pipe_fd(self) -> Generator[int]: | ||||||
| """Create a throwaway FD via os.pipe() so we don't touch real stdio.""" | ||||||
| r, w = os.pipe() | ||||||
| os.close(r) | ||||||
| yield w | ||||||
| try: | ||||||
| os.close(w) | ||||||
| except OSError: | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this necessary? Perhaps leave a comment. |
||||||
| pass | ||||||
|
|
||||||
| @pytest.mark.parametrize( | ||||||
| "cls, empty", | ||||||
| [ | ||||||
| (capture.FDCapture, ""), | ||||||
| (capture.FDCaptureBinary, b""), | ||||||
| ], | ||||||
| ids=["text", "binary"], | ||||||
| ) | ||||||
| def test_snap_returns_empty_on_closed_tmpfile( | ||||||
| self, pipe_fd: int, cls: type, empty: str | bytes | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| ) -> None: | ||||||
| cap = cls(pipe_fd) | ||||||
| cap.start() | ||||||
| cap.tmpfile.close() | ||||||
| with pytest.warns(pytest.PytestWarning, match="capture tmpfile was closed"): | ||||||
| result = cap.snap() | ||||||
| assert result == empty | ||||||
| cap.done() | ||||||
|
|
||||||
|
|
||||||
| @contextlib.contextmanager | ||||||
| def saved_fd(fd): | ||||||
| new_fd = os.dup(fd) | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move this message to a constant and reuse in both places?