Skip to content

Handle removing resources without parents #108

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

Open
Mirochill wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle removing resources without parents #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/commoncode/resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,8 +906,9 @@ def remove_resource(self, resource):
parent = resource.parent(self)
if TRACE:
logger_debug(" parent", parent)
parent.children_names.remove(resource.name)
parent.save(self)
if parent:
parent.children_names.remove(resource.name)
parent.save(self)

# remove resource proper
self._remove_resource(resource)
Expand Down
13 changes: 13 additions & 0 deletions tests/test_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,19 @@ def test_walk_skip_root_basic(self):
]
assert [(r.name, r.is_file) for r in results] == expected

def test_remove_resource_without_parent(self):
test_codebase = self.get_test_loc("resource/codebase")
codebase = Codebase(test_codebase)
resource = codebase.get_resource("codebase/dir/that")
parent = resource.parent(codebase)

codebase.resources_by_path.pop(parent.path)

removed_paths = codebase.remove_resource(resource)

assert removed_paths == {resource.location}
assert resource.path not in codebase.resources_by_path

def test_walk_filtered_with_filtered_root(self):
test_codebase = self.get_test_loc("resource/codebase")
codebase = Codebase(test_codebase)
Expand Down