feat: add SSH test cases to test.py

- Add check_ssh_localhost() that tests SSH connectivity and symlinks
  fastsync-server into PATH if needed
- Add SSH_CASES with single-threaded, multithreaded, and compression tests
- Support no_server mode in run_single_test for SSH tests
- Skip SSH tests gracefully when SSH/localhost/fastsync-server unavailable
This commit is contained in:
2026-07-06 20:03:57 +02:00
parent 1012c5c151
commit 3b92501dc7
+52 -1
View File
@@ -67,6 +67,12 @@ TEST_CASES = [
{"name": "Sendfile + Multithreading (-f -m)", "flags": ["-f", "-m"]}, {"name": "Sendfile + Multithreading (-f -m)", "flags": ["-f", "-m"]},
] ]
SSH_CASES = [
{"name": "SSH (localhost)", "flags": []},
{"name": "SSH Multithreading (-m)", "flags": ["-m"]},
{"name": "SSH Compression (-c)", "flags": ["-c"]},
]
RSYNC_CASES = [ RSYNC_CASES = [
{"name": "rsync (archive)", "args": ["-aH"]}, {"name": "rsync (archive)", "args": ["-aH"]},
{"name": "rsync (archive + compress)", "args": ["-aHz"]}, {"name": "rsync (archive + compress)", "args": ["-aHz"]},
@@ -184,9 +190,12 @@ def start_rsync_daemon(source_dir):
return port, conf, daemon return port, conf, daemon
def run_single_test(cmd, name, source_dir, dest_dir, *, source_prefix=None): def run_single_test(cmd, name, source_dir, dest_dir, *, source_prefix=None, no_server=False):
if os.path.exists(dest_dir): if os.path.exists(dest_dir):
shutil.rmtree(dest_dir) shutil.rmtree(dest_dir)
if no_server:
server = None
else:
server = subprocess.Popen(SERVER_CMD, stdout=subprocess.DEVNULL, stderr=None) server = subprocess.Popen(SERVER_CMD, stdout=subprocess.DEVNULL, stderr=None)
time.sleep(0.5) time.sleep(0.5)
try: try:
@@ -194,6 +203,7 @@ def run_single_test(cmd, name, source_dir, dest_dir, *, source_prefix=None):
result = subprocess.run(cmd, text=True, capture_output=True) result = subprocess.run(cmd, text=True, capture_output=True)
duration = time.monotonic() - start duration = time.monotonic() - start
finally: finally:
if server:
wait_proc(server) wait_proc(server)
mismatches, missing = [], [] mismatches, missing = [], []
@@ -259,6 +269,19 @@ def run_profile(profile_name, source_dir, dest_dir):
except Exception as e: except Exception as e:
results.append({"name": case["name"], "suite": profile_name, "status": "Error", "time": "N/A", "error": str(e)}) results.append({"name": case["name"], "suite": profile_name, "status": "Error", "time": "N/A", "error": str(e)})
if SSH_AVAILABLE:
for case in SSH_CASES:
flags = BASE_CLIENT_FLAGS + (["-M"] if case.get("use_metadata", True) else []) + case["flags"]
ssh_dest = f"localhost:{dest_dir}_ssh"
cmd = client_prefix + BASE_CLIENT_CMD + [source_dir, ssh_dest] + flags
print(f"\n --- {case['name']} ---\n Running: {' '.join(cmd)}")
try:
r = run_single_test(cmd, case["name"], source_dir, f"{dest_dir}_ssh", no_server=True)
r["suite"] = profile_name
results.append(r)
except Exception as e:
results.append({"name": case["name"], "suite": profile_name, "status": "Error", "time": "N/A", "error": str(e)})
port, conf, daemon = start_rsync_daemon(source_dir) port, conf, daemon = start_rsync_daemon(source_dir)
try: try:
for case in RSYNC_CASES: for case in RSYNC_CASES:
@@ -348,7 +371,28 @@ def format_throughput(bps):
return f"{bps:.0f} B/s" return f"{bps:.0f} B/s"
SSH_AVAILABLE = False
def check_ssh_localhost():
global SSH_AVAILABLE
build_dir = os.path.abspath("build")
server_path = os.path.join(build_dir, "server")
r = subprocess.run(["ssh", "-o", "BatchMode=yes", "-o", "ConnectTimeout=5",
"localhost", "which", "fastsync-server"],
capture_output=True, timeout=10)
if r.returncode != 0:
install = subprocess.run(["ssh", "-o", "BatchMode=yes", "localhost",
f"mkdir -p ~/.local/bin && ln -sf {server_path} ~/.local/bin/fastsync-server"],
capture_output=True, timeout=10)
if install.returncode == 0:
r = subprocess.run(["ssh", "-o", "BatchMode=yes", "localhost",
"which", "fastsync-server"], capture_output=True, timeout=10)
SSH_AVAILABLE = r.returncode == 0
def preflight_checks(): def preflight_checks():
global SSH_AVAILABLE
errors = [] errors = []
print("Pre-flight checks:") print("Pre-flight checks:")
print(" [1] --help flag...", end=" ") print(" [1] --help flag...", end=" ")
@@ -385,6 +429,13 @@ def preflight_checks():
print("FAIL") print("FAIL")
errors.append("Posix arg syntax failed") errors.append("Posix arg syntax failed")
check_ssh_localhost()
print(" [5] SSH to localhost...", end=" ")
if SSH_AVAILABLE:
print("OK")
else:
print("SKIP (install fastsync-server in PATH on remote)")
if errors: if errors:
print(f"\n {len(errors)} pre-flight check(s) failed: {', '.join(errors)}") print(f"\n {len(errors)} pre-flight check(s) failed: {', '.join(errors)}")
sys.exit(1) sys.exit(1)