scripts: parallel test runner with -j option

Replace the bash logic in run_tests.sh with run_tests.py, which builds
udpproxy and runs pytest twice (connections, then authentication) with
optional -n J for pytest-xdist parallelism. run_tests.sh becomes a thin
shim that activates the venv and execs the Python runner so existing CI
and README invocations keep working. Add pytest-xdist to setup_ci.sh.

The keys.tdb backup/restore dance in the old script is dropped: workers
now use per-worker tmpdirs, so the repo-root keys.tdb is never touched.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: tridge

scripts/run_tests.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+"""
+Test runner for UDPProxy.
+
+Builds the udpproxy binary then runs the pytest suite. Pass -j N to run
+tests in parallel via pytest-xdist; each worker gets its own tmpdir and
+port pair so they don't collide.
+"""
+import argparse
+import os
+import subprocess
+import sys
+
+REPO_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
+
+
+def run(cmd, **kwargs):
+    print('+', ' '.join(cmd), flush=True)
+    subprocess.check_call(cmd, **kwargs)
+
+
+def main():
+    ap = argparse.ArgumentParser(description=__doc__)
+    ap.add_argument('-j', type=int, default=1,
+                    help='parallel pytest workers via pytest-xdist (default: 1)')
+    ap.add_argument('--no-build', action='store_true',
+                    help='skip the make step (use existing udpproxy binary)')
+    args, extra = ap.parse_known_args()
+
+    os.chdir(REPO_ROOT)
+
+    if not args.no_build:
+        print('=== Building UDPProxy ===')
+        run(['make', 'clean'])
+        run(['make', 'distclean'])
+        run(['make', 'all'])
+
+    if not os.path.isfile('udpproxy'):
+        sys.exit('ERROR: udpproxy binary not found')
+    print('udpproxy binary built successfully')
+
+    pytest_base = [sys.executable, '-m', 'pytest', '-v']
+    if args.j > 1:
+        pytest_base += ['-n', str(args.j)]
+
+    # Two pytest invocations: connection tests first (uses test_server with a
+    # live udpproxy), then authentication tests (mutates keys.tdb directly,
+    # would clobber test_server's view if combined). Each invocation
+    # parallelizes internally.
+    print('\n=== Running Connection Tests ===')
+    run(pytest_base + ['tests/test_connections.py'] + extra)
+
+    print('\n=== Running Authentication Tests ===')
+    run(pytest_base + ['tests/test_authentication.py'] + extra)
+
+    print('\nAll tests completed.')
+
+
+if __name__ == '__main__':
+    main()

scripts/run_tests.sh

@@ -1,75 +1,9 @@
 #!/bin/bash
+# Thin wrapper that activates the project venv (if present) and forwards to
+# scripts/run_tests.py. The real logic lives in the Python runner so it can
+# accept -j for pytest-xdist parallelism.
 
-# Test runner script for UDPProxy
-# This script runs all tests with proper error handling
-
-set -e  # Exit on any error
-set -u  # Exit on undefined variable
-set -o pipefail  # Exit on pipe failure
-
-# Ensure we're running from repository root
+set -e
 cd "$(dirname "$0")/.."
-
-echo "=== UDPProxy Test Runner ==="
-
-# Cleanup function to restore database on exit
-cleanup() {
-    echo ""
-    echo "=== Cleanup ==="
-    if [ -f "keys.tdb.backup" ]; then
-        echo "Restoring original keys.tdb from backup"
-        mv keys.tdb.backup keys.tdb
-    else
-        echo "Removing test database"
-        rm -f keys.tdb
-    fi
-}
-
-# Set trap to ensure cleanup happens on normal exit too
-trap cleanup EXIT
-
-# Activate virtual environment
-echo "Activating virtual environment..."
 test -f venv/bin/activate && source venv/bin/activate
-
-# Build UDPProxy
-echo "Building UDPProxy..."
-make clean
-make distclean
-make all
-
-# Verify build
-if [ ! -f "./udpproxy" ]; then
-    echo "ERROR: UDPProxy build failed - executable not found"
-    exit 1
-fi
-
-echo "✓ UDPProxy binary built successfully"
-
-# Backup existing database if it exists
-echo "Setting up test database..."
-if [ -f "keys.tdb" ]; then
-    echo "Backing up existing keys.tdb to keys.tdb.backup"
-    mv keys.tdb keys.tdb.backup
-fi
-
-# Create fresh test database
-echo "Initializing test database..."
-python3 keydb.py initialise
-
-# Run tests
-echo ""
-echo "=== Running Tests ==="
-
-echo ""
-echo "=== Running Connection Tests ==="
-pytest tests/test_connections.py -v -s
-
-echo ""
-echo "=== Running Authentication Tests ==="
-pytest tests/test_authentication.py -v -s
-
-echo ""
-echo "=== Test Summary ==="
-echo "All tests completed successfully!"
-echo "UDPProxy is ready for use."
+exec python3 scripts/run_tests.py "$@"

scripts/setup_ci.sh

@@ -36,7 +36,7 @@ source venv/bin/activate
 
 echo "Installing Python dependencies..."
 pip install --upgrade pip
-pip install pytest pymavlink
+pip install pytest pytest-xdist pymavlink
 
 echo "Verifying tdb module accessibility..."
 python3 -c "import tdb; print('tdb module is available')"