No shims, one marker system. The full mechanical sweep:
- 165 test files converted: every @pytest.mark.<os>_only decorator and
pytestmark assignment is now platforms("<os>"). Docstring/comment
prose mentioning the trio rewritten to the platforms() vocabulary.
- conftest: _OS_MARKS, the legacy skip loop, the double-mark reject for
the trio, and the selector-tagging shim are deleted. The single
platforms() gate does all host gating; _reject_contradictory_platform_
marks replaces the old reject (one platforms() marker per test — a
module-level pytestmark stacked on a per-test marker is the historic
skipped-everywhere-green-everywhere failure and stays a hard error).
- pyproject: only the platforms marker is registered.
- list_os_marked_tests.py: rewritten for the single vocabulary — takes
a platform name (linux/macos/windows), matches quoted platforms(...)
specs including negated and any-of forms, exits nonzero on empty
selection. Its test file rewritten to match (bare identifiers must
not match; the spec must appear inside the string literal).
- tests.yml macOS lane: marker: macos feeds the lister; the pytest
selection is -m "platforms and not integration" — the marker name is
the selector, the conftest's per-test host skips are the gate.
- test_os_marker_gating.py rewritten for the new reject (the old file
tested deleted machinery).
- AGENTS.md / CONTRIBUTING.md updated to the single vocabulary.
Verified: full-tree compile; marker unit tests (36); lister tests;
macOS-lane simulation (21 files, 180 collected / 429 deselected on a
windows host); broad xdist slices through scripts/run_tests.sh
(367 + 1674 passed, zero refactor-attributable failures — the 6 red
tests in the second slice fail identically with the changes stashed).
162 lines
6.3 KiB
Python
162 lines
6.3 KiB
Python
import os
|
|
import types
|
|
|
|
import pytest
|
|
from fastapi.testclient import TestClient
|
|
|
|
from hermes_cli import web_server
|
|
|
|
|
|
def test_ssh_ownership_endpoint_requires_token_and_returns_exact_nonce(monkeypatch):
|
|
token = "t" * 64
|
|
nonce = "0123456789abcdef"
|
|
monkeypatch.setattr(web_server, "_SESSION_TOKEN", token)
|
|
monkeypatch.setattr(web_server, "_SSH_OWNER_NONCE", nonce)
|
|
web_server.app.state.auth_required = False
|
|
client = TestClient(web_server.app)
|
|
|
|
assert client.get("/api/ssh/ownership").status_code == 401
|
|
response = client.get(
|
|
"/api/ssh/ownership",
|
|
headers={"X-Hermes-Session-Token": token},
|
|
)
|
|
assert response.status_code == 200
|
|
assert response.json() == {
|
|
"ok": True,
|
|
"sshOwnerNonce": nonce,
|
|
"protocolVersion": 1,
|
|
"runtimeIntact": True,
|
|
}
|
|
|
|
|
|
def test_ssh_ownership_reports_replaced_runtime(tmp_path, monkeypatch):
|
|
token = "t" * 64
|
|
monkeypatch.setattr(web_server, "_SESSION_TOKEN", token)
|
|
monkeypatch.setattr(web_server, "_SSH_OWNER_NONCE", "0123456789abcdef")
|
|
monkeypatch.setattr(web_server, "_SSH_RUNTIME_MARKER", None)
|
|
# A REAL purelib file whose recorded inode deliberately mismatches what
|
|
# os.stat now reports — never patch os.stat globally here: web_server.os
|
|
# is the os module itself, and swapping its stat() poisons every other
|
|
# thread in this worker process (daemon threads from earlier tests crash
|
|
# in their excepthooks → nondeterministic teardown errors across the
|
|
# whole suite, the Aug 2026 CI flake).
|
|
purelib = tmp_path / "site-packages"
|
|
purelib.mkdir()
|
|
st = purelib.stat()
|
|
monkeypatch.setattr(
|
|
web_server, "_SSH_RUNTIME_PURELIB", (str(purelib), st.st_dev, st.st_ino + 1)
|
|
)
|
|
client = TestClient(web_server.app)
|
|
|
|
response = client.get("/api/ssh/ownership", headers={"X-Hermes-Session-Token": token})
|
|
|
|
assert response.status_code == 200
|
|
assert response.json()["runtimeIntact"] is False
|
|
|
|
|
|
def test_ssh_runtime_marker_detects_recreated_venv_even_with_reused_inode(
|
|
tmp_path, monkeypatch
|
|
):
|
|
"""The exact #82429 repro: rm -rf venv && recreate. On ext4 the new
|
|
site-packages directory routinely REUSES the old inode (proven live
|
|
during salvage), so the stat snapshot alone reports intact. The marker
|
|
file is the deterministic tier: it dies with the old tree."""
|
|
purelib = tmp_path / "venv" / "lib" / "site-packages"
|
|
purelib.mkdir(parents=True)
|
|
# Swap the MODULE ATTRIBUTE on web_server, not sysconfig.get_paths itself:
|
|
# sysconfig is process-global, and mutating it races every other thread
|
|
# in the worker (same cross-thread poisoning class as the os.stat patch
|
|
# this file used to have).
|
|
monkeypatch.setattr(
|
|
web_server,
|
|
"sysconfig",
|
|
types.SimpleNamespace(get_paths=lambda *a, **k: {"purelib": str(purelib)}),
|
|
)
|
|
|
|
web_server._apply_ssh_owner_nonce("0123456789abcdef")
|
|
try:
|
|
assert web_server._ssh_runtime_intact() is True
|
|
|
|
# Replace the venv; the recreated directory may reuse the inode.
|
|
import shutil
|
|
|
|
shutil.rmtree(tmp_path / "venv")
|
|
purelib.mkdir(parents=True)
|
|
|
|
assert web_server._ssh_runtime_intact() is False, (
|
|
"marker tier must catch a recreated venv regardless of inode reuse"
|
|
)
|
|
finally:
|
|
web_server._apply_ssh_owner_nonce(None)
|
|
|
|
|
|
def test_ssh_runtime_marker_survives_in_place_installs(tmp_path, monkeypatch):
|
|
"""pip/uv installs INTO the live venv must not read as a replacement."""
|
|
purelib = tmp_path / "venv" / "lib" / "site-packages"
|
|
purelib.mkdir(parents=True)
|
|
# Swap the MODULE ATTRIBUTE on web_server, not sysconfig.get_paths itself:
|
|
# sysconfig is process-global, and mutating it races every other thread
|
|
# in the worker (same cross-thread poisoning class as the os.stat patch
|
|
# this file used to have).
|
|
monkeypatch.setattr(
|
|
web_server,
|
|
"sysconfig",
|
|
types.SimpleNamespace(get_paths=lambda *a, **k: {"purelib": str(purelib)}),
|
|
)
|
|
|
|
web_server._apply_ssh_owner_nonce("0123456789abcdef")
|
|
try:
|
|
(purelib / "newpkg").mkdir() # a package landing in the live venv
|
|
assert web_server._ssh_runtime_intact() is True
|
|
finally:
|
|
web_server._apply_ssh_owner_nonce(None)
|
|
|
|
|
|
@pytest.mark.platforms("linux")
|
|
def test_ssh_runtime_readonly_purelib_falls_back_to_stat(tmp_path, monkeypatch):
|
|
"""When site-packages is unwritable the marker can't be placed; the
|
|
stat-snapshot fallback still arms (weaker, never a false stale)."""
|
|
purelib = tmp_path / "venv" / "lib" / "site-packages"
|
|
purelib.mkdir(parents=True)
|
|
# Swap the MODULE ATTRIBUTE on web_server, not sysconfig.get_paths itself:
|
|
# sysconfig is process-global, and mutating it races every other thread
|
|
# in the worker (same cross-thread poisoning class as the os.stat patch
|
|
# this file used to have).
|
|
monkeypatch.setattr(
|
|
web_server,
|
|
"sysconfig",
|
|
types.SimpleNamespace(get_paths=lambda *a, **k: {"purelib": str(purelib)}),
|
|
)
|
|
# Make the directory REALLY unwritable instead of patching builtins.open:
|
|
# a global open() patch races every other thread in the worker process
|
|
# (daemon threads crash in their excepthooks → nondeterministic teardown
|
|
# errors file-wide, the Aug 2026 CI flake). chmod is thread-safe and
|
|
# exercises the genuine OSError path.
|
|
if os.geteuid() == 0: # pragma: no cover - root ignores mode bits
|
|
pytest.skip("directory write bits are not enforced for root")
|
|
purelib.chmod(0o555)
|
|
try:
|
|
web_server._apply_ssh_owner_nonce("0123456789abcdef")
|
|
try:
|
|
assert web_server._SSH_RUNTIME_MARKER is None
|
|
assert web_server._SSH_RUNTIME_PURELIB is not None
|
|
assert web_server._ssh_runtime_intact() is True
|
|
finally:
|
|
web_server._apply_ssh_owner_nonce(None)
|
|
finally:
|
|
purelib.chmod(0o755) # let tmp_path cleanup succeed
|
|
|
|
|
|
def test_ssh_ownership_endpoint_is_absent_without_owner_nonce(monkeypatch):
|
|
token = "t" * 64
|
|
monkeypatch.setattr(web_server, "_SESSION_TOKEN", token)
|
|
monkeypatch.setattr(web_server, "_SSH_OWNER_NONCE", None)
|
|
web_server.app.state.auth_required = False
|
|
client = TestClient(web_server.app)
|
|
|
|
response = client.get(
|
|
"/api/ssh/ownership",
|
|
headers={"X-Hermes-Session-Token": token},
|
|
)
|
|
assert response.status_code == 404
|