andrew
881aa33eef
Adds end-to-end Linux compatibility work for the dedicated server: new CI workflow (Ubuntu + Arch), line-ending/executable safeguards, and a local venv-first startup flow with split dependency files for server vs optional host GUI tooling. Improves runtime resilience with better bind error messages, stricter config validation, writable-state checks, cleaner socket/thread shutdown behavior, and SIGTERM-aware graceful stop handling for headless/systemd use. Updates deployment/startup docs and adds portability/runtime integration tests to lock in these behaviors.
99 lines
2.7 KiB
Python
99 lines
2.7 KiB
Python
from __future__ import annotations
|
|
|
|
import json
|
|
import os
|
|
import signal
|
|
import socket
|
|
import subprocess
|
|
import sys
|
|
import time
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
pytestmark = pytest.mark.skipif(os.name == "nt", reason="SIGTERM integration is POSIX-only")
|
|
|
|
SERVER_DIR = Path(__file__).resolve().parents[1]
|
|
|
|
|
|
def _free_port() -> int:
|
|
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
|
|
sock.bind(("127.0.0.1", 0))
|
|
return int(sock.getsockname()[1])
|
|
|
|
|
|
def test_sigterm_exits_cleanly(tmp_path: Path) -> None:
|
|
game_port = _free_port()
|
|
admin_port = _free_port()
|
|
config_path = tmp_path / "commonwealth-server.json"
|
|
config_path.write_text(
|
|
json.dumps(
|
|
{
|
|
"host": "127.0.0.1",
|
|
"port": game_port,
|
|
"server_name": "CI Test Server",
|
|
"server_description": "",
|
|
"max_players": 4,
|
|
"log_verbosity": "info",
|
|
"admin_port": admin_port,
|
|
},
|
|
indent=2,
|
|
)
|
|
+ "\n",
|
|
encoding="utf-8",
|
|
newline="\n",
|
|
)
|
|
|
|
env = os.environ.copy()
|
|
env["PYTHONUNBUFFERED"] = "1"
|
|
env["NO_COLOR"] = "1"
|
|
|
|
process = subprocess.Popen(
|
|
[
|
|
sys.executable,
|
|
"-u",
|
|
str(SERVER_DIR / "consumer_server_cli.py"),
|
|
"serve",
|
|
"--config",
|
|
str(config_path),
|
|
],
|
|
cwd=str(SERVER_DIR),
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.STDOUT,
|
|
text=True,
|
|
env=env,
|
|
)
|
|
|
|
try:
|
|
deadline = time.time() + 10.0
|
|
connected = False
|
|
while time.time() < deadline:
|
|
try:
|
|
with socket.create_connection(("127.0.0.1", game_port), timeout=0.5) as conn:
|
|
welcome = conn.recv(4096)
|
|
if b"welcome" in welcome:
|
|
connected = True
|
|
break
|
|
except OSError:
|
|
time.sleep(0.1)
|
|
assert connected, "server did not accept a test client in time"
|
|
|
|
# Admin probe over localhost only.
|
|
with socket.create_connection(("127.0.0.1", admin_port), timeout=2.0) as admin:
|
|
admin.sendall(b'{"cmd":"ping"}\n')
|
|
response = admin.recv(4096)
|
|
assert b'"ok":true' in response.replace(b" ", b"")
|
|
|
|
process.send_signal(signal.SIGTERM)
|
|
try:
|
|
exit_code = process.wait(timeout=10.0)
|
|
except subprocess.TimeoutExpired:
|
|
process.kill()
|
|
pytest.fail("server did not exit after SIGTERM")
|
|
|
|
assert exit_code == 0
|
|
finally:
|
|
if process.poll() is None:
|
|
process.kill()
|
|
process.wait(timeout=5.0)
|