mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-06-08 06:05:57 -04:00
0d4fb1bc89
Target previously-uncovered functions in the path/file-operation files the
resolver restructure touches, confirmed hit under coverage:
preallocate --preallocate (syscall.c do_fallocate) and sparse hole-punching
via --preallocate --sparse and --inplace --sparse (do_punch_hole),
on a file several levels deep.
fuzzy-basis --fuzzy basis selection with similar-named candidates and no
exact match, so the generator scores them (util1.c fuzzy_distance).
delete-deep add a --backup --delete case so removing an extraneous
backup-suffixed file consults delete.c is_backup_file.
preallocate probes --preallocate support up front and skips where it is
unavailable: macOS, the *BSDs and Solaris build without fallocate/posix_fallocate
(and FALLOC_FL_PUNCH_HOLE is Linux-only), and reject the option outright. It runs
on Linux and Cygwin. fuzzy-basis and delete-deep are plain local transfers with
no skips. All green on master and under --protocol=29/30.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
108 lines
4.4 KiB
Python
108 lines
4.4 KiB
Python
#!/usr/bin/env python3
|
|
"""Coverage of the --delete family at depth, plus --max-delete, --existing and
|
|
--ignore-existing.
|
|
|
|
delete_test.py covers --del dry-run output, --remove-source-files and per-dir
|
|
protect filters; this companion asserts the concrete outcome of deletion deep
|
|
in the tree (the subtree walk the resolver restructure touches) and the
|
|
controls that bound or invert it.
|
|
"""
|
|
|
|
import os
|
|
|
|
from rsyncfns import (
|
|
FROMDIR, TODIR,
|
|
assert_exists, assert_not_exists, assert_same, make_tree, makepath, rmtree,
|
|
run_rsync, test_fail, walk_files,
|
|
)
|
|
|
|
src = FROMDIR
|
|
|
|
|
|
def seed_src():
|
|
rmtree(src)
|
|
make_tree(src, depth=3)
|
|
return [p.relative_to(src) for p in walk_files(src)]
|
|
|
|
|
|
def fresh_dest():
|
|
rmtree(TODIR)
|
|
run_rsync('-a', f'{src}/', f'{TODIR}/')
|
|
|
|
|
|
# --- --delete removes a deep extraneous file and subtree --------------------
|
|
rels = seed_src()
|
|
fresh_dest()
|
|
makepath(TODIR / 'd1' / 'd2' / 'extra')
|
|
(TODIR / 'd1' / 'd2' / 'extra' / 'junk').write_text("x\n")
|
|
(TODIR / 'd1' / 'd2' / 'orphan').write_text("y\n")
|
|
run_rsync('-a', '--delete', f'{src}/', f'{TODIR}/')
|
|
assert_not_exists(TODIR / 'd1' / 'd2' / 'extra', label='--delete deep dir')
|
|
assert_not_exists(TODIR / 'd1' / 'd2' / 'orphan', label='--delete deep file')
|
|
for rel in rels:
|
|
assert_same(TODIR / rel, src / rel, label=f'--delete kept {rel}')
|
|
|
|
# --- every delete-timing variant yields the same deep deletion --------------
|
|
for variant in ('--delete-before', '--delete-during', '--delete-delay',
|
|
'--delete-after'):
|
|
fresh_dest()
|
|
(TODIR / 'd1' / 'd2' / 'gone.txt').write_text("z\n")
|
|
run_rsync('-a', variant, f'{src}/', f'{TODIR}/')
|
|
assert_not_exists(TODIR / 'd1' / 'd2' / 'gone.txt', label=f'{variant} deep')
|
|
|
|
# --- --max-delete caps the number of deletions ------------------------------
|
|
fresh_dest()
|
|
for i in range(5):
|
|
(TODIR / f'extra{i}').write_text("e\n")
|
|
run_rsync('-a', '--delete', '--max-delete=2', f'{src}/', f'{TODIR}/',
|
|
check=False) # rsync exits 25 when the limit is hit
|
|
remaining = list(TODIR.glob('extra*'))
|
|
if len(remaining) != 3:
|
|
test_fail(f"--max-delete=2 should leave 3 of 5 extras, found "
|
|
f"{len(remaining)}: {remaining}")
|
|
|
|
# --- --existing only updates files already present (creates nothing) ---------
|
|
seed_src()
|
|
rmtree(TODIR)
|
|
makepath(TODIR / 'd1')
|
|
(TODIR / 'd1' / 'f1').write_text("old\n")
|
|
run_rsync('-a', '--existing', f'{src}/', f'{TODIR}/')
|
|
assert_same(TODIR / 'd1' / 'f1', src / 'd1' / 'f1',
|
|
label='--existing updated existing deep file')
|
|
assert_not_exists(TODIR / 'f0', label='--existing did not create new top file')
|
|
assert_not_exists(TODIR / 'd1' / 'd2', label='--existing did not create new dir')
|
|
|
|
# --- --ignore-existing skips present files, creates the rest -----------------
|
|
seed_src()
|
|
rmtree(TODIR)
|
|
makepath(TODIR / 'd1')
|
|
(TODIR / 'd1' / 'f1').write_text("KEEP THIS\n")
|
|
run_rsync('-a', '--ignore-existing', f'{src}/', f'{TODIR}/')
|
|
if (TODIR / 'd1' / 'f1').read_text() != "KEEP THIS\n":
|
|
test_fail("--ignore-existing overwrote an existing deep file")
|
|
assert_same(TODIR / 'f0', src / 'f0', label='--ignore-existing created new file')
|
|
|
|
# --- --backup --delete consults is_backup_file -------------------------------
|
|
# Under --backup with no --backup-dir, an extraneous file is backed up to
|
|
# <name>~ before removal, but a name that already ends in the backup suffix is
|
|
# unlinked directly rather than re-backed-up to <name>~~ (delete.c
|
|
# is_backup_file). rsync auto-protects *~ from deletion, so without an explicit
|
|
# "risk" rule the suffixed file is never even a deletion candidate and that
|
|
# branch is unreachable; the R rule un-protects it so the branch actually runs.
|
|
rels = seed_src()
|
|
fresh_dest()
|
|
d = TODIR / 'd1' / 'd2'
|
|
(d / 'plain').write_text("extraneous\n") # normal -> backed up to plain~
|
|
(d / 'stale~').write_text("already a backup\n") # suffixed -> unlinked, no stale~~
|
|
run_rsync('-a', '-b', '--delete', '--filter=R *~', f'{src}/', f'{TODIR}/')
|
|
assert_not_exists(d / 'plain', label='--backup --delete removed extraneous')
|
|
assert_exists(d / 'plain~', label='--backup backed up the extraneous file')
|
|
assert_not_exists(d / 'stale~', label='--backup --delete removed suffixed orphan')
|
|
assert_not_exists(d / 'stale~~',
|
|
label='is_backup_file: already-suffixed file unlinked, not re-backed-up')
|
|
for rel in rels:
|
|
assert_same(TODIR / rel, src / rel, label=f'--backup --delete kept {rel}')
|
|
|
|
print("delete-deep: delete family, max-delete, existing/ignore-existing, "
|
|
"backup-delete at depth")
|