TapTap
e32733fbf6
The single-threaded and -m receivers never populated ReceiverStats.matched_data or .deleted_files, so --stats always printed 0 for both even when rsync reported nonzero. Track the bytes reconstructed from the basis file while applying a delta, and tally the delete-commit counts (manifest and per-directory sessions) into the receiver stats. The -m pipeline now carries its own stats/would-delete fields and emits the STATUS_STATS frame before the terminal success, so --threads finally reports the counters and renders -n --delete lines. Also normalize the -n --delete would-delete enumeration's absolute basis prefixes exactly like the real commit path (fixing an over-report) and fix the basis_delete_relative off-by-one when the receive root is '/'. Unit tests cover the root mapping and the basis protection; integration tests cover matched/deleted stats for both receivers and the --threads dry-run delete lines.
169 lines
6.9 KiB
Python
169 lines
6.9 KiB
Python
"""Differential/regression coverage for the parity-completion review blockers.
|
|
|
|
Each test pins a fix against real ``rsync 3.4.1`` where a deterministic
|
|
comparison exists; the differential tests skip cleanly when rsync is absent.
|
|
"""
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
sys.path.insert(0, os.path.dirname(__file__))
|
|
from common import ( # noqa: E402
|
|
TEST_DATA_DIR,
|
|
ServerManager,
|
|
clean_dir,
|
|
get_dest_received_dir,
|
|
run_client,
|
|
)
|
|
|
|
RSYNC = shutil.which("rsync")
|
|
requires_rsync = pytest.mark.skipif(RSYNC is None, reason="rsync 3.4.1 not installed")
|
|
|
|
|
|
def _write(path, content):
|
|
os.makedirs(os.path.dirname(path), exist_ok=True)
|
|
with open(path, "wb") as fh:
|
|
fh.write(content)
|
|
|
|
|
|
def _tree(root):
|
|
"""Sorted relative paths of every entry below root (files and dirs)."""
|
|
out = []
|
|
for dirpath, dirs, files in os.walk(root):
|
|
for name in dirs:
|
|
out.append(os.path.relpath(os.path.join(dirpath, name), root))
|
|
for name in files:
|
|
out.append(os.path.relpath(os.path.join(dirpath, name), root))
|
|
return sorted(out)
|
|
|
|
|
|
def _rsync(args):
|
|
env = dict(os.environ, LC_ALL="C")
|
|
return subprocess.run([RSYNC] + args, capture_output=True, text=True, env=env, timeout=120)
|
|
|
|
|
|
class TestRelativePerDirDeleteScope:
|
|
"""Blocker #1: -R --delete-during/--delete-delay must not delete destination
|
|
content outside the transferred prefix (rsync keeps sibling directories)."""
|
|
|
|
@requires_rsync
|
|
@pytest.mark.ci
|
|
@pytest.mark.parametrize("timing", ["--delete-during", "--delete-delay"])
|
|
def test_prefix_scoped_delete_matches_rsync(self, timing):
|
|
source = os.path.join(TEST_DATA_DIR, "delblk_src")
|
|
clean_dir(source)
|
|
_write(os.path.join(source, "foo", "a.txt"), b"payload\n")
|
|
spec = source + "/./foo"
|
|
|
|
def seed(root):
|
|
clean_dir(root)
|
|
_write(os.path.join(root, "foo", "extra.txt"), b"stale\n")
|
|
_write(os.path.join(root, "unrelated", "keep.txt"), b"keep\n")
|
|
|
|
rdst = os.path.join(TEST_DATA_DIR, "delblk_rdst")
|
|
dest = os.path.join(TEST_DATA_DIR, "delblk_dst")
|
|
seed(rdst)
|
|
seed(dest)
|
|
r = _rsync(["-aR", timing, spec, rdst + "/"])
|
|
assert r.returncode == 0, r.stderr
|
|
with ServerManager() as server:
|
|
server.start(extra_args=["--allow-delete"])
|
|
result, _ = run_client(spec, dest, flags=["-a", "-R", timing], port=server.port)
|
|
assert result.returncode == 0, (result.stderr or result.stdout)[:300]
|
|
# The prefix's parent-directory sibling survives on both sides.
|
|
assert os.path.isfile(os.path.join(dest, "unrelated", "keep.txt"))
|
|
assert os.path.isfile(os.path.join(rdst, "unrelated", "keep.txt"))
|
|
# The in-scope extra is removed on both sides.
|
|
assert not os.path.exists(os.path.join(dest, "foo", "extra.txt"))
|
|
assert not os.path.exists(os.path.join(rdst, "foo", "extra.txt"))
|
|
assert _tree(dest) == _tree(rdst)
|
|
|
|
|
|
def _stats_value(text, label):
|
|
for line in text.splitlines():
|
|
if line.startswith(label + ":"):
|
|
return int(line.split(":", 1)[1].strip().split()[0].replace(",", ""))
|
|
return None
|
|
|
|
|
|
def _seed_delta_pair(tag):
|
|
"""Source file plus a same-size/basis destination file whose mtime differs,
|
|
and an extra destination file to be deleted."""
|
|
source = os.path.join(TEST_DATA_DIR, f"stats_{tag}_src")
|
|
dest = os.path.join(TEST_DATA_DIR, f"stats_{tag}_dst")
|
|
rdst = os.path.join(TEST_DATA_DIR, f"stats_{tag}_rdst")
|
|
clean_dir(source)
|
|
clean_dir(dest)
|
|
clean_dir(rdst)
|
|
payload = (b"0123456789abcdef" * 16384)[:200000]
|
|
_write(os.path.join(source, "f.bin"), payload)
|
|
# Destination basis: same length, one byte changed, deliberately older.
|
|
basis = bytearray(payload)
|
|
basis[100000] ^= 0xFF
|
|
received = get_dest_received_dir(dest, source)
|
|
for root in (rdst, received):
|
|
_write(os.path.join(root, "f.bin"), bytes(basis))
|
|
_write(os.path.join(root, "extra.txt"), b"delete me\n")
|
|
old = 1000000
|
|
os.utime(os.path.join(root, "f.bin"), (old, old))
|
|
return source, dest, rdst
|
|
|
|
|
|
class TestReceiverWireStats:
|
|
"""Blocker #3/#4: the receiver must populate the STATUS_STATS counters
|
|
(matched data, deleted files) on both the single-threaded and -m paths."""
|
|
|
|
@requires_rsync
|
|
@pytest.mark.ci
|
|
@pytest.mark.parametrize("threads", [False, True])
|
|
def test_stats_reports_matched_and_deleted(self, threads):
|
|
source, dest, rdst = _seed_delta_pair(f"mt{int(threads)}")
|
|
rsync_result = _rsync(["-a", "--stats", "--delete", "--no-whole-file", source + "/",
|
|
rdst + "/"])
|
|
assert rsync_result.returncode == 0, rsync_result.stderr
|
|
assert _stats_value(rsync_result.stdout, "Matched data") > 0
|
|
assert _stats_value(rsync_result.stdout, "Number of deleted files") == 1
|
|
|
|
with ServerManager() as server:
|
|
server.start(extra_args=["--allow-delete"])
|
|
flags = ["-a", "--stats", "--delete", "--delta", "--incremental"]
|
|
if threads:
|
|
flags.append("--threads")
|
|
result, _ = run_client(source, dest, flags=flags, port=server.port)
|
|
assert result.returncode == 0, (result.stderr or result.stdout)[:300]
|
|
assert _stats_value(result.stdout, "Matched data") > 0, result.stdout
|
|
assert _stats_value(result.stdout, "Number of deleted files") == 1, result.stdout
|
|
|
|
@requires_rsync
|
|
@pytest.mark.ci
|
|
def test_threads_dry_run_delete_lines_match_rsync(self):
|
|
"""-n --delete --threads must emit transfer-relative `*deleting` lines."""
|
|
source = os.path.join(TEST_DATA_DIR, "stats_drydel_src")
|
|
dest = os.path.join(TEST_DATA_DIR, "stats_drydel_dst")
|
|
rdst = os.path.join(TEST_DATA_DIR, "stats_drydel_rdst")
|
|
clean_dir(source)
|
|
clean_dir(dest)
|
|
clean_dir(rdst)
|
|
_write(os.path.join(source, "a.txt"), b"a\n")
|
|
for root in (rdst, get_dest_received_dir(dest, source)):
|
|
_write(os.path.join(root, "extra.txt"), b"x\n")
|
|
_write(os.path.join(root, "sub", "y.txt"), b"y\n")
|
|
rsync_result = _rsync(["-a", "-n", "--delete", "-i", source + "/", rdst + "/"])
|
|
assert rsync_result.returncode == 0, rsync_result.stderr
|
|
rsync_del = sorted(
|
|
line for line in rsync_result.stdout.splitlines() if line.startswith("*deleting")
|
|
)
|
|
with ServerManager() as server:
|
|
server.start(extra_args=["--allow-delete"])
|
|
result, _ = run_client(source, dest,
|
|
flags=["-a", "-n", "--delete", "-i", "--threads"],
|
|
port=server.port)
|
|
assert result.returncode == 0, (result.stderr or result.stdout)[:300]
|
|
fast_del = sorted(
|
|
line for line in result.stdout.splitlines() if line.startswith("*deleting")
|
|
)
|
|
assert fast_del and fast_del == rsync_del, f"rsync={rsync_del}\nfastsync={fast_del}"
|