mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-01 12:45:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #8304 from ThomasWaldmann/improve-healing-test-master

Browse source 
improve borg check --repair healing tests, see #8302
This commit is contained in:
TW 2024-07-23 22:31:46 +02:00 committed by GitHub
commit 929c642b6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/archive.py
View file

@ -282,6 +282,8 @@ def unpack_many(self, ids, *, filter=None, preload=False):
item = Item(internal_dict=_item)
if "chunks" in item:
item.chunks = [ChunkListEntry(*e) for e in item.chunks]
if "chunks_healthy" in item:
item.chunks_healthy = [ChunkListEntry(*e) for e in item.chunks_healthy]
if filter and not filter(item):
continue
if preload and "chunks" in item:

19
src/borg/testsuite/archiver/check_cmd.py
View file

@ -115,14 +115,20 @@ def test_missing_file_chunk(archivers, request):
output = cmd(archiver, "list", "archive1", "--format={health}#{path}{NL}", exit_code=0)
assert "broken#" in output
# check that the file in the old archives has now a different chunk list without the killed chunk
# check that the file in the old archives has now a different chunk list without the killed chunk.
# also check that the correct original chunks list is preserved in item.chunks_healthy.
for archive_name in ("archive1", "archive2"):
archive, repository = open_archive(archiver.repository_path, archive_name)
with repository:
for item in archive.iter_items():
if item.path.endswith(src_file):
assert valid_chunks != item.chunks
assert len(valid_chunks) == len(item.chunks)
assert killed_chunk not in item.chunks
assert valid_chunks != item.chunks
assert "chunks_healthy" in item
assert len(valid_chunks) == len(item.chunks_healthy)
assert killed_chunk in item.chunks_healthy
assert valid_chunks == item.chunks_healthy
break
else:
pytest.fail("should not happen") # convert 'fail'
@ -136,13 +142,15 @@ def test_missing_file_chunk(archivers, request):
assert "Healed previously missing file chunk" in output
assert f"{src_file}: Completely healed previously damaged file!" in output
# check that the file in the old archives has the correct chunks again
# check that the file in the old archives has the correct chunks again.
# also check that chunks_healthy list is removed as it is not needed any more.
for archive_name in ("archive1", "archive2"):
archive, repository = open_archive(archiver.repository_path, archive_name)
with repository:
for item in archive.iter_items():
if item.path.endswith(src_file):
assert valid_chunks == item.chunks
assert "chunks_healthy" not in item
break
else:
pytest.fail("should not happen")
@ -151,6 +159,11 @@ def test_missing_file_chunk(archivers, request):
output = cmd(archiver, "list", "archive1", "--format={health}#{path}{NL}", exit_code=0)
assert "broken#" not in output
# check should be fine now (and not show it has healed anything).
output = cmd(archiver, "check", "-v", "--repair", exit_code=0)
assert "Healed previously missing file chunk" not in output
assert "testsuite/archiver.py: Completely healed previously damaged file!" not in output
def test_missing_archive_item_chunk(archivers, request):
archiver = request.getfixturevalue(archivers)