Skip to content

Commit 62e49f5

Browse files
committed
testsuite: decouple peer fixture from current version
1 parent 7d277d5 commit 62e49f5

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

‎testsuite/tests/selftests/runner.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,22 @@ def invoke(args):
278278
if executed.exists():
279279
test_fail('an archived symlink bypassed identity checks')
280280
banner = subprocess.run([binary, '--version'], capture_output=True, text=True, check=True).stdout
281-
peer, protocol = parse_peer_banner(banner)
281+
_, protocol = parse_peer_banner(banner)
282+
peer = '3.5.2'
283+
peer_binary = context.scratch / 'released-peer'
284+
peer_binary.write_text(
285+
f'#!{sys.executable}\n'
286+
'import os, sys\n'
287+
f'current = {binary!r}\n'
288+
'if sys.argv[1:] == ["--version"]:\n'
289+
f' print("rsync version {peer} protocol version {protocol}")\n'
290+
'else:\n'
291+
' os.execv(current, [current] + sys.argv[1:])\n'
292+
)
293+
peer_binary.chmod(0o755)
282294
profile = context.scratch / f'peer-{peer}.json'
283295
command = [sys.executable, str(context.repository / 'testsuite' / 'runtests.py'), 'cli-transfers',
284-
f'--rsync-bin={binary}', f'--rsync-bin2={binary}', f'--tooldir={context.tools}',
296+
f'--rsync-bin={binary}', f'--rsync-bin2={peer_binary}', f'--tooldir={context.tools}',
285297
f'--srcdir={context.repository}', f'--profiles={profile}', f'--receipt={receipt}']
286298
role = 'root' if os.geteuid() == 0 else 'nonroot'
287299
for names in ('root,nonroot', 'nonroot' if role == 'root' else 'root'):

0 commit comments

Comments
 (0)