Merge pull request #468 from ludovic111/fix/parity-free-ports

[tools] parity harnesses: free ports instead of fixed ones
This commit is contained in:
Ludovic Marie
2026-10-16 09:16:45 +02:00
committed by GitHub
5 changed files with 36 additions and 10 deletions
+1 -1
View File
@@ -1874,7 +1874,7 @@ def build_flat(h, force=False):
return []
work = h.LOCAL / 'gen' / (version + '-flat')
shutil.rmtree(work, ignore_errors=True)
port = 30000 + (h.os.getpid() + data_version + 1) % 20000
port = h.free_port()
class FlatServer(h.Server):
def __init__(self, directory): # as Server.__init__, with a flat world
+7 -2
View File
@@ -13,7 +13,6 @@ so that player data exists. The saved world is kept in datafix/worlds/VERSION be
import argparse
import hashlib
import json
import os
import queue
import re
import shutil
@@ -160,6 +159,12 @@ def install_runtime(pin, home):
target.symlink_to(to)
def free_port():
with socket.socket() as s:
s.bind(('127.0.0.1', 0))
return s.getsockname()[1]
class Server:
def __init__(self, directory, jar, port, packs=(), java='java', props_override=None):
directory.mkdir(parents=True, exist_ok=True)
@@ -423,7 +428,7 @@ def build(name, force=False):
era = scene.era(data_version)
work = LOCAL / 'gen' / name
shutil.rmtree(work, ignore_errors=True)
port = 30000 + (os.getpid() + data_version) % 20000
port = free_port()
server = Server(work, jar, port, scene.experiments(data_version), java(version), props)
problems = []
+9 -2
View File
@@ -29,6 +29,7 @@ import os
import queue
import re
import shutil
import socket
import subprocess
import sys
import tempfile
@@ -45,7 +46,6 @@ LOCAL = ROOT / '.local'
RESOURCES = LOCAL / 'horizon-client' / '26.3'
SERVER = LOCAL / 'minecraft' / '26.3' / 'jars' / 'server.jar'
RUN = LOCAL / 'save-roundtrip' / 'run'
PORT = 25000 + (os.getpid() % 5000) + 1000
# Game rules Horizon's player changes before saving: rule -> (vanilla's value, Horizon's).
# The new value must be in Horizon's save, and nothing else may differ (#74).
@@ -96,8 +96,15 @@ BENIGN = re.compile(r'(Unpacking |OFFLINE/INSECURE|online-mode|authenticate user
# ---------------------------------------------------------------- vanilla server
def free_port():
with socket.socket() as s:
s.bind(('127.0.0.1', 0))
return s.getsockname()[1]
class Vanilla:
def __init__(self, directory, port=PORT, world='world', extra=None):
def __init__(self, directory, port=None, world='world', extra=None):
port = port or free_port()
directory.mkdir(parents=True, exist_ok=True)
(directory / 'eula.txt').write_text('eula=true\n')
props = {
+8 -2
View File
@@ -8,8 +8,8 @@ level.dat, player and data/*.dat files) is applied exactly. The original is kept
upgrade_world.py SOURCE_WORLD DEST_WORLD
"""
import random
import shutil
import socket
import subprocess
import sys
import tempfile
@@ -19,6 +19,12 @@ ROOT = Path(__file__).resolve().parent.parent
SERVER = ROOT / '.local' / 'minecraft' / '26.3' / 'jars' / 'server.jar'
def free_port():
with socket.socket() as s:
s.bind(('127.0.0.1', 0))
return s.getsockname()[1]
def main():
if len(sys.argv) != 3:
sys.exit(__doc__)
@@ -31,7 +37,7 @@ def main():
scratch = Path(scratch)
(scratch / 'eula.txt').write_text('eula=true\n')
(scratch / 'server.properties').write_text(
f'level-name=world\nonline-mode=false\nserver-port={random.randint(30000, 60000)}\n')
f'level-name=world\nonline-mode=false\nserver-port={free_port()}\n')
shutil.copytree(source, scratch / 'world')
# The server upgrades at startup, then keeps running as a normal server: stop it
# once it reports "Done".
+11 -3
View File
@@ -17,6 +17,7 @@ load failures.
import argparse
import os
import re
import socket
import subprocess
import sys
import threading
@@ -30,22 +31,29 @@ BENIGN = re.compile(r'(Unpacking |OFFLINE/INSECURE|online-mode|authenticate user
r'Failed to load properties|Failed to load eula)')
def free_port():
with socket.socket() as s:
s.bind(('127.0.0.1', 0))
return s.getsockname()[1]
def main():
p = argparse.ArgumentParser()
p.add_argument('--jar', required=True)
p.add_argument('--dir', required=True)
p.add_argument('--world', default='world')
p.add_argument('--seed', default='12345')
p.add_argument('--port', default='25671')
p.add_argument('--port', type=int, default=0, help='default: a free port')
p.add_argument('--command', action='append', default=[])
p.add_argument('--wait-after', type=float, default=1.0)
p.add_argument('--timeout', type=float, default=240)
args = p.parse_args()
port = args.port or free_port()
os.makedirs(args.dir, exist_ok=True)
with open(os.path.join(args.dir, 'eula.txt'), 'w') as f:
f.write('eula=true\n')
props = {
'server-port': args.port, 'online-mode': 'false', 'level-seed': args.seed,
'server-port': port, 'online-mode': 'false', 'level-seed': args.seed,
'level-name': args.world, 'spawn-protection': '0', 'view-distance': '4',
'simulation-distance': '4', 'sync-chunk-writes': 'true', 'enable-query': 'false',
'enable-rcon': 'false', 'management-server-enabled': 'false',
@@ -83,7 +91,7 @@ def main():
def run(name=name, seconds=float(seconds)):
try:
vanilla_login.join('127.0.0.1', int(args.port), name, seconds)
vanilla_login.join('127.0.0.1', port, name, seconds)
except Exception as e: # reported in the log check below
lines.append(f'login failed: {e}')