mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-06-08 06:05:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

runtests: add --rsync-bin2 / --expect-result for version-mixing tests

Browse Source 
Let the suite run with two rsync binaries so the current build can be
tested against the actual old code of a previous release, rather than
only forcing the current binary to speak an old protocol (check29/30).

  --rsync-bin2 PATH  exports RSYNC_PEER, the binary used for the SERVER
                     side of two-sided transfers (the daemon process and
                     the remote-shell --rsync-path target). Defaults to
                     RSYNC, so single-binary runs are byte-for-byte
                     unchanged.
  --expect-result F  the manifest's listed tests ARE the run set; each
                     test's actual outcome (pass/skip/fail/xfail) is
                     compared to its expected one and any mismatch --
                     including an unexpected pass (xpass) -- fails the
                     run. --expect-skipped and the default exit logic
                     are untouched.

rsyncfns gains the RSYNC_PEER global and launches the daemon with it
(start_rsyncd / start_test_daemon, the latter with an optional rsync_cmd
override used by the reverse-direction test); the remote-shell tests
pass --rsync-path={RSYNC_PEER}. All no-ops when no peer is selected.

Direction is fixed: the current binary always drives (only it
understands the new test scripts); the old binary is only ever the
server/daemon side.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Andrew Tridgell
2026-05-31 21:00:51 +10:00
parent c0219caf15
commit e21cdabd71
10 changed files with 171 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testsuite/ssh-basic_test.py
View File

@@ -38,17 +38,17 @@ print(f"Using remote shell: {SSH}")
hands_setup()
# RSYNC may be a multi-word command line; pass it through --rsync-path.
from rsyncfns import RSYNC
from rsyncfns import RSYNC, RSYNC_PEER
def _basic():
checkit(['-avH', '-e', SSH, f'--rsync-path={RSYNC}',
checkit(['-avH', '-e', SSH, f'--rsync-path={RSYNC_PEER}',
f'{FROMDIR}/', f'localhost:{TODIR}'], FROMDIR, TODIR)
def _delete_after_rename():
shutil.move(str(TODIR / 'text'), str(TODIR / 'ThisShouldGo'))
checkit(['--delete', '-avH', '-e', SSH, f'--rsync-path={RSYNC}',
checkit(['--delete', '-avH', '-e', SSH, f'--rsync-path={RSYNC_PEER}',
f'{FROMDIR}/', f'localhost:{TODIR}'], FROMDIR, TODIR)