Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/borgstore/backends/posixfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,8 @@ def delete(self, name):

def move(self, curr_name, new_name):
def _rename_to_new_name():
curr_path.rename(new_path)
# replace() (not rename()) so an existing destination also gets replaced on Windows.
curr_path.replace(new_path)

if not self.opened:
raise BackendMustBeOpen()
Expand Down
9 changes: 9 additions & 0 deletions tests/test_backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,15 @@ def test_missing_nesting_dir_move(tested_backends, request):
backend.move("namespace2/nest2/key2", "namespace2a/nest2a/key2a")


def test_move_replaces_existing(tested_backends, request):
with get_backend_from_fixture(tested_backends, request) as backend:
backend.store("key1", b"value1")
backend.store("key2", b"value2")
backend.move("key1", "key2")
assert not backend.info("key1").exists
assert backend.load("key2") == b"value1"


def test_parent_is_an_object(tested_backends, request):
# a name below an object (not below a directory) does not exist, like on Windows, where the OS reports
# such a path as not found (on POSIX, it is ENOTDIR).
Expand Down
6 changes: 6 additions & 0 deletions tests/test_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,12 @@ def test_move_delete_undelete(posixfs_store_created):
store.move(nsk0, undelete=True) # undelete a previously soft-deleted item
assert list_store_names(store, ns, deleted=False) == [k0, k1]
assert list_store_names(store, ns, deleted=True) == []
# Delete again, while a soft-deleted item of the same name exists
store.move(nsk0, delete=True) # soft-delete
store.store(nsk0, v0) # same name again
store.move(nsk0, delete=True) # soft-delete, replacing the already soft-deleted item
assert list_store_names(store, ns, deleted=False) == [k1]
assert list_store_names(store, ns, deleted=True) == [k0]


def test_move_change_level(posixfs_store_created):
Expand Down
Loading