Fix file deletion crash if file is already gone #6677
Conversation
This file contains 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
| def try_unlink(name: str) -> None: | ||
| try: | ||
| os.unlink(name) | ||
| except Exception: |
There was a problem hiding this comment.
Wondering whether this should only catch a FileNotFoundError so as not to hide other errors. Linting requires the except not be bare at minimum so put Exception for now
There was a problem hiding this comment.
FileNotFoundError makes mose sense here I think.
mhils
reviewed
Apr 19, 2024
| def try_unlink(name: str) -> None: | ||
| try: | ||
| os.unlink(name) | ||
| except Exception: |
There was a problem hiding this comment.
FileNotFoundError makes mose sense here I think.
| from mitmproxy.tools.console import master | ||
|
|
||
|
|
||
| def test_try_unlink_file_not_exists(): |
There was a problem hiding this comment.
Can we use https://docs.pytest.org/en/7.1.x/how-to/tmp_path.html please? Cleaning up after mkdtemp is a bit annoying.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
In the event the file is no longer present, mitmproxy raises an exception in the deleting thread which is displayed in the TUI. Update to make the
os.unlinkcall tolerant to file non-existence. Based on #4233Checklist