d10bb2ab6f
`scripts/run_tests.sh tests/<dir>/` is how a change gets its regression
coverage run, so a test filed under the wrong directory is a test nobody
runs when that code changes. Two kinds of drift had accumulated.
Parallel directories for one source package, folded into the mirror:
tests/acp -> tests/acp_adapter (its __init__/conftest move with it)
tests/cli -> tests/hermes_cli (prompt_toolkit fixture merged into
hermes_cli/conftest.py)
tests/run_agent -> tests/agent (backoff fixture becomes
agent/conftest.py)
tests/relay -> tests/gateway/relay
tests/state -> tests/hermes_state
246 loose files at tests/ root, routed by the package they import/patch:
hermes_cli, hermes_state, agent, gateway, tools, plugins, tui_gateway, cron.
Installer and desktop-update script tests go to tests/scripts/{install,
desktop_update}/. 43 tests of root-level modules (batch_runner, utils,
hermes_constants, packaging) stay at the root.
Filenames drop their issue numbers (95 files: test_89315_x.py -> test_x.py);
the number stays in the module docstring where it has context.
Collisions: test_cli_skin_integration.py existed in both tests/ and tests/cli
with different subsets — merged into one (10 tests, all kept);
run_agent/test_pre_compress_memory_context.py -> agent/..._handoff.py;
tests/test_account_usage.py -> agent/test_account_usage_fetch.py;
tests/test_web_server.py -> hermes_cli/test_web_server_ws_ping.py.
Deleted: test_minisweagent_path.py (empty since PR #2804),
test_model_picker_scroll.py (tested a private copy of the logic, imported
nothing), test_process_loop_event_loop_warning.py (asserted asyncio behaviour,
imported nothing from Hermes).
Repo-root path arithmetic (Path(__file__).parents[N], dirname chains) is
bumped for the 202 files that changed depth and verified by evaluating every
such expression against the new location. classify_changes' desktop-updater
lane prefix, tests-os.yml's ignore glob and every in-tree path comment follow
the moves. tests/test_tests_tree_layout.py keeps the tree from drifting back.
140 lines
3.4 KiB
Python
140 lines
3.4 KiB
Python
"""Tests for plugins/plugin_utils.py — thread-safe lazy singleton helpers.
|
|
|
|
These exercise the actual concurrency guarantee with real threads (not mocks):
|
|
a barrier releases N threads simultaneously into the accessor, and we assert
|
|
the factory ran exactly once.
|
|
"""
|
|
|
|
import threading
|
|
|
|
import pytest
|
|
|
|
from plugins.plugin_utils import SingletonSlot, lazy_singleton
|
|
|
|
|
|
# --- lazy_singleton -------------------------------------------------------
|
|
|
|
|
|
def test_lazy_singleton_builds_once_and_returns_same_instance():
|
|
calls = []
|
|
|
|
@lazy_singleton
|
|
def get():
|
|
calls.append(1)
|
|
return object()
|
|
|
|
a = get()
|
|
b = get()
|
|
assert a is b
|
|
assert len(calls) == 1
|
|
|
|
|
|
def test_lazy_singleton_reset_rebuilds():
|
|
counter = {"n": 0}
|
|
|
|
@lazy_singleton
|
|
def get():
|
|
counter["n"] += 1
|
|
return counter["n"]
|
|
|
|
assert get() == 1
|
|
assert get() == 1
|
|
get.reset()
|
|
assert get() == 2
|
|
|
|
|
|
|
|
|
|
def test_lazy_singleton_concurrent_first_call_builds_once():
|
|
build_count = {"n": 0}
|
|
build_lock = threading.Lock()
|
|
barrier = threading.Barrier(16)
|
|
results = []
|
|
results_lock = threading.Lock()
|
|
|
|
@lazy_singleton
|
|
def get():
|
|
# Count builds under a lock so the assertion is exact even if the
|
|
# double-checked lock had a bug and let two through.
|
|
with build_lock:
|
|
build_count["n"] += 1
|
|
# Simulate an expensive build so threads genuinely overlap.
|
|
import time
|
|
time.sleep(0.01)
|
|
return object()
|
|
|
|
def worker():
|
|
barrier.wait() # release all threads at once
|
|
obj = get()
|
|
with results_lock:
|
|
results.append(obj)
|
|
|
|
threads = [threading.Thread(target=worker) for _ in range(16)]
|
|
for t in threads:
|
|
t.start()
|
|
for t in threads:
|
|
t.join()
|
|
|
|
assert build_count["n"] == 1, "factory must run exactly once under race"
|
|
assert len(results) == 16
|
|
assert all(r is results[0] for r in results), "all callers share one instance"
|
|
|
|
|
|
# --- SingletonSlot --------------------------------------------------------
|
|
|
|
|
|
def test_slot_caches_first_value():
|
|
slot: SingletonSlot = SingletonSlot()
|
|
assert slot.peek() is None
|
|
v1 = slot.get(lambda: "first")
|
|
assert slot.peek() == "first"
|
|
# Subsequent factory is ignored — first value wins.
|
|
v2 = slot.get(lambda: "second")
|
|
assert v1 == v2 == "first"
|
|
|
|
|
|
|
|
|
|
def test_slot_factory_exception_not_cached():
|
|
slot: SingletonSlot = SingletonSlot()
|
|
|
|
def boom():
|
|
raise ValueError("nope")
|
|
|
|
with pytest.raises(ValueError):
|
|
slot.get(boom)
|
|
assert slot.peek() is None
|
|
assert slot.get(lambda: "recovered") == "recovered"
|
|
|
|
|
|
def test_slot_concurrent_first_call_builds_once():
|
|
build_count = {"n": 0}
|
|
build_lock = threading.Lock()
|
|
barrier = threading.Barrier(16)
|
|
slot: SingletonSlot = SingletonSlot()
|
|
results = []
|
|
results_lock = threading.Lock()
|
|
|
|
def factory():
|
|
with build_lock:
|
|
build_count["n"] += 1
|
|
import time
|
|
time.sleep(0.01)
|
|
return object()
|
|
|
|
def worker():
|
|
barrier.wait()
|
|
obj = slot.get(factory)
|
|
with results_lock:
|
|
results.append(obj)
|
|
|
|
threads = [threading.Thread(target=worker) for _ in range(16)]
|
|
for t in threads:
|
|
t.start()
|
|
for t in threads:
|
|
t.join()
|
|
|
|
assert build_count["n"] == 1
|
|
assert len(results) == 16
|
|
assert all(r is results[0] for r in results)
|