Handle TrashPermissionError, now that it exists #5894
Merged
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
_check_trash() was added (in jupyter#3304) because TrashPermissionError didn't exist, yet. Now that it does, we can use it, and stop guessing what will cause a permission problem. Closes: jupyter#3374
If the test working directory isn't trashable, we expect to not be able to delete the non-empty directory.
stefanor
changed the title
kevin-bates
approved these changes
Dec 22, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In Ubuntu's automated test environment full log example, both HOME and the temporary directories are likely to be on a tmpfs. That will cause
gi.repository.GLib.GError: g-io-error-quark: Trashing on system internal mounts is not supported (15)which will raise aTrashPermissionError.As the comments in the code indicate,
_check_trash()was added (in #3304) becauseTrashPermissionErrordidn'texist, yet. We asked send2trash to implement such an exception, so that we wouldn't have to guess whether a file was trash-able or not, and they did. So, let's take advantage of it.
Because we don't permanently delete, recursively,
test_delete_non_empty_dirwill now fail in environments where the test data isn't trash-able. So, handle that, and skip the test gracefully.Closes: #3374