Skip to content
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.

Sign up for GitHub

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

Allowing non empty dirs to be deleted #3108

Merged
merged 13 commits into from
Dec 5, 2017
Merged

Allowing non empty dirs to be deleted #3108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bcc343d
Allowing non empty dirs to be deleted
kirit93 Dec 4, 2017
f24d3d7
Not allowing permanent deletion of non empty dirs
kirit93 Dec 4, 2017
a307af9
Minor bug fix
kirit93 Dec 4, 2017
03d5d90
Changed order of checks in delete_file
kirit93 Dec 5, 2017
7f23ad6
modified test for deleting non empty directory
kirit93 Dec 5, 2017
773e55c
modified test for deleting non empty directory
kirit93 Dec 5, 2017
081dcd5
Added test for permanent delete
kirit93 Dec 5, 2017
9733b14
Resolved conflicts
kirit93 Dec 5, 2017
31a6625
Fixed test
kirit93 Dec 5, 2017
d136c12
Added test for deleting non empty dirs
kirit93 Dec 5, 2017
98b8e2e
Made test for thorough
kirit93 Dec 5, 2017
051cee6
Squashed all commits. Tests pass.
kirit93 Dec 5, 2017
b7e02a6
Merge branch 'fixes2760' of https://github.com/kirit93/notebook into …
kirit93 Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions notebook/services/contents/filemanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,17 +489,8 @@ def delete_file(self, path):
path = path.strip('/')
os_path = self._get_os_path(path)
rm = os.unlink
if os.path.isdir(os_path):
listing = os.listdir(os_path)
# Don't delete non-empty directories.
# A directory containing only leftover checkpoints is
# considered empty.
cp_dir = getattr(self.checkpoints, 'checkpoint_dir', None)
for entry in listing:
if entry != cp_dir:
raise web.HTTPError(400, u'Directory %s not empty' % os_path)
elif not os.path.isfile(os_path):
raise web.HTTPError(404, u'File does not exist: %s' % os_path)
if not os.path.exists(os_path):
raise web.HTTPError(404, u'File or directory does not exist: %s' % os_path)

if self.delete_to_trash:
self.log.debug("Sending %s to trash", os_path)
Expand All @@ -510,6 +501,14 @@ def delete_file(self, path):
return

if os.path.isdir(os_path):
listing = os.listdir(os_path)
# Don't permanently delete non-empty directories.
# A directory containing only leftover checkpoints is
# considered empty.
cp_dir = getattr(self.checkpoints, 'checkpoint_dir', None)
for entry in listing:
if entry != cp_dir:
raise web.HTTPError(400, u'Directory %s not empty' % os_path)
self.log.debug("Removing directory %s", os_path)
with self.perm_to_403():
shutil.rmtree(os_path)
Expand Down
8 changes: 5 additions & 3 deletions notebook/services/contents/tests/test_contents_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,11 @@ def test_delete_dirs(self):
self.assertEqual(listing, [])

def test_delete_non_empty_dir(self):
"""delete non-empty dir raises 400"""
with assert_http_error(400):
self.api.delete(u'å b')
# Test that non empty directory can be deleted
self.api.delete(u'å b')
# Check if directory has actually been deleted
with assert_http_error(404):
self.api.list(u'å b')

def test_rename(self):
resp = self.api.rename('foo/a.ipynb', 'foo/z.ipynb')
Expand Down