mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-07-30 23:36:21 -04:00
1f689ec0c2
Replace the entire shell-based testsuite with Python. runtests.py
already drove the suite (it had replaced runtests.sh earlier); this
converts all 60 test scripts from *.test shell to *_test.py and adds
testsuite/rsyncfns.py as the shared helper module -- the Python
counterpart of the now-removed rsync.fns.
runtests.py:
* Discovers and runs both *.test and *_test.py; dispatches the
Python tests via the same python3 that runs the harness.
* Extends PYTHONPATH so tests can `import rsyncfns`.
testsuite/rsyncfns.py provides everything the ports need:
* environment wiring (scratchdir / srcdir / TOOLDIR / RSYNC /
TLS_ARGS, and HOME pointed at the per-test scratch dir);
* result reporting -- test_fail / test_skipped / test_xfail mapping
to the 0 / 1 / 77 / 78 exit-code convention;
* the transfer-and-verify helpers checkit, checkdiff, verify_dirs,
rsync_ls_lR, check_perms and the v_filt output filter;
* fixture builders hands_setup, build_symlinks, build_rsyncd_conf,
make_data_file, cp_p / cp_touch, makepath / rmtree.
All 60 tests are converted, including the four split-variant tests
that share one source via a Makefile-built symlink (chown/chown-fake,
devices/devices-fake, xattrs/xattrs-hlink, exclude/exclude-lsh);
Makefile.in's CHECK_SYMLINKS now points at the *_test.py names.
The dead rsync.fns shell library is removed.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
90 lines
2.7 KiB
Python
90 lines
2.7 KiB
Python
#!/usr/bin/env python3
|
|
# Python rewrite of testsuite/merge.test.
|
|
#
|
|
# Verify that rsync merges files from multiple source directories into a
|
|
# single destination, with later sources NOT clobbering earlier ones for
|
|
# unchanged content and per-directory conflict resolution behaving as in
|
|
# the canonical case.
|
|
|
|
import os
|
|
import time
|
|
|
|
from rsyncfns import (
|
|
CHKDIR, TMPDIR, TODIR,
|
|
checkit, cp_touch, run_rsync,
|
|
)
|
|
|
|
|
|
# Use relative names below so the rsync command line exercises the
|
|
# arg-parsing path the way the shell test did.
|
|
os.chdir(TMPDIR)
|
|
|
|
for d in ('from1', 'from2', 'from3', 'deep'):
|
|
os.mkdir(d)
|
|
for d in ('from2/sub1', 'from3/sub1', 'from3/sub2', 'from1/dir-and-not-dir'):
|
|
os.mkdir(d)
|
|
|
|
CHKDIR.mkdir(exist_ok=True)
|
|
for d in ('sub1', 'sub2', 'dir-and-not-dir'):
|
|
(CHKDIR / d).mkdir()
|
|
|
|
with open('from1/one', 'w') as f:
|
|
f.write("one\n")
|
|
cp_touch('from1/one', 'from2/one')
|
|
cp_touch('from1/one', 'from3/one')
|
|
|
|
with open('from1/two', 'w') as f:
|
|
f.write("two\n")
|
|
with open('from2/three', 'w') as f:
|
|
f.write("three\n")
|
|
with open('from3/four', 'w') as f:
|
|
f.write("four\n")
|
|
with open('from1/five', 'w') as f:
|
|
f.write("five\n")
|
|
with open('from3/six', 'w') as f:
|
|
f.write("six\n")
|
|
with open('from2/sub1/uno', 'w') as f:
|
|
f.write("sub1\n")
|
|
cp_touch('from2/sub1/uno', 'from3/sub1/uno')
|
|
with open('from3/sub1/dos', 'w') as f:
|
|
f.write("sub2\n")
|
|
with open('from2/sub1/tres', 'w') as f:
|
|
f.write("sub3\n")
|
|
with open('from3/sub2/subby', 'w') as f:
|
|
f.write("subby\n")
|
|
with open('from1/dir-and-not-dir/inside', 'w') as f:
|
|
f.write("extra\n")
|
|
with open('from3/dir-and-not-dir', 'w') as f:
|
|
f.write("not-dir\n")
|
|
with open('deep/arg-test', 'w') as f:
|
|
f.write("arg-test\n")
|
|
with open('shallow', 'w') as f:
|
|
f.write("shallow\n")
|
|
|
|
for src in ('from1/one', 'from1/two', 'from2/three', 'from3/four',
|
|
'from1/five', 'from3/six'):
|
|
cp_touch(src, str(CHKDIR))
|
|
cp_touch('deep/arg-test', str(CHKDIR))
|
|
cp_touch('shallow', str(CHKDIR))
|
|
cp_touch('from1/dir-and-not-dir/inside', str(CHKDIR / 'dir-and-not-dir'))
|
|
for src in ('from2/sub1/uno', 'from3/sub1/dos', 'from2/sub1/tres'):
|
|
cp_touch(src, str(CHKDIR / 'sub1'))
|
|
cp_touch('from3/sub2/subby', str(CHKDIR / 'sub2'))
|
|
|
|
# Make sure time has moved on before the rsync runs.
|
|
time.sleep(1)
|
|
|
|
# Pre-sync directory-only updates to flatten directory-time differences,
|
|
# matching the shell test's --existing -f 'exclude,! */' preparation.
|
|
def _flatten_dirs(src, dst):
|
|
run_rsync('-av', '--existing', '-f', 'exclude,! */', f'{src}/', f'{dst}/')
|
|
|
|
|
|
_flatten_dirs('from1', 'from2')
|
|
_flatten_dirs('from2', 'from3')
|
|
_flatten_dirs('from1', str(CHKDIR))
|
|
_flatten_dirs('from3', str(CHKDIR))
|
|
|
|
checkit(['-avv', 'deep/arg-test', 'shallow', 'from1/', 'from2/', 'from3/', 'to/'],
|
|
CHKDIR, TODIR)
|