a1a8a0320d
- a second load_plugin_module caller while the first is mid-exec must get the fully executed module, never the published shell - a persistence-isolated fork (no session DB, no memory manager) skips the checkpoint gate; a durable agent still fails closed Co-authored-by: Albert.Zhou <57474+albert748@users.noreply.github.com> Co-authored-by: stephane <stephane@fastmail.com> Co-authored-by: Kyzcreig <9063726+Kyzcreig@users.noreply.github.com> Co-authored-by: Turgut Kural <58116817+TurgutKural@users.noreply.github.com>
113 lines
3.7 KiB
Python
113 lines
3.7 KiB
Python
"""Regression tests for directory-plugin module loading."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import sys
|
|
import threading
|
|
from types import SimpleNamespace
|
|
|
|
from plugins.plugin_loader import load_plugin_module
|
|
|
|
|
|
def test_failed_sibling_is_removed_before_init_handles_missing_import(tmp_path):
|
|
"""A failed eager sibling import must remain catchable as ModuleNotFoundError."""
|
|
plugin_dir = tmp_path / "plugin"
|
|
plugin_dir.mkdir()
|
|
(plugin_dir / "broken.py").write_text(
|
|
"from .missing_dependency import value\n",
|
|
encoding="utf-8",
|
|
)
|
|
(plugin_dir / "__init__.py").write_text(
|
|
"try:\n"
|
|
" from .broken import value\n"
|
|
"except ModuleNotFoundError:\n"
|
|
" fallback_used = True\n",
|
|
encoding="utf-8",
|
|
)
|
|
module_name = "test_plugin_loader_package.failed_sibling"
|
|
|
|
try:
|
|
module = load_plugin_module(
|
|
module_name,
|
|
plugin_dir,
|
|
parents=(),
|
|
logger=logging.getLogger(__name__),
|
|
)
|
|
|
|
assert module is not None
|
|
assert module.fallback_used is True
|
|
assert f"{module_name}.broken" not in sys.modules
|
|
finally:
|
|
for name in tuple(sys.modules):
|
|
if name == module_name or name.startswith(f"{module_name}."):
|
|
sys.modules.pop(name, None)
|
|
|
|
|
|
def test_successful_sibling_remains_available_on_loaded_module(tmp_path):
|
|
"""Cleaning failed siblings must not alter the eager success path."""
|
|
plugin_dir = tmp_path / "plugin"
|
|
plugin_dir.mkdir()
|
|
(plugin_dir / "helper.py").write_text("value = 42\n", encoding="utf-8")
|
|
(plugin_dir / "__init__.py").write_text(
|
|
"from .helper import value\n",
|
|
encoding="utf-8",
|
|
)
|
|
module_name = "test_plugin_loader_package.successful_sibling"
|
|
|
|
try:
|
|
module = load_plugin_module(
|
|
module_name,
|
|
plugin_dir,
|
|
parents=(),
|
|
logger=logging.getLogger(__name__),
|
|
)
|
|
|
|
assert module is not None
|
|
assert module.value == 42
|
|
assert module.helper.value == 42
|
|
finally:
|
|
for name in tuple(sys.modules):
|
|
if name == module_name or name.startswith(f"{module_name}."):
|
|
sys.modules.pop(name, None)
|
|
|
|
|
|
def test_concurrent_load_waits_for_the_first_load_to_finish(tmp_path):
|
|
"""A second caller must never receive the half-built shell published mid-load."""
|
|
plugin_dir = tmp_path / "plugin"
|
|
plugin_dir.mkdir()
|
|
gate_name = "_test_plugin_loader_race_gate"
|
|
gate = SimpleNamespace(entered=threading.Event(), release=threading.Event())
|
|
sys.modules[gate_name] = gate
|
|
(plugin_dir / "slow.py").write_text(
|
|
f"import sys\ngate = sys.modules[{gate_name!r}]\n"
|
|
"gate.entered.set()\ngate.release.wait(10)\n",
|
|
encoding="utf-8",
|
|
)
|
|
(plugin_dir / "__init__.py").write_text("def register(ctx):\n pass\n", encoding="utf-8")
|
|
module_name = "test_plugin_loader_package.concurrent_load"
|
|
results = {}
|
|
|
|
def load(key):
|
|
mod = load_plugin_module(module_name, plugin_dir, parents=(), logger=logging.getLogger(__name__))
|
|
results[key] = hasattr(mod, "register")
|
|
|
|
first = threading.Thread(target=load, args=("first",))
|
|
second = threading.Thread(target=load, args=("second",))
|
|
try:
|
|
first.start()
|
|
assert gate.entered.wait(5)
|
|
second.start()
|
|
second.join(0.5)
|
|
gate.release.set()
|
|
first.join(10)
|
|
second.join(10)
|
|
|
|
assert results == {"first": True, "second": True}
|
|
finally:
|
|
gate.release.set()
|
|
sys.modules.pop(gate_name, None)
|
|
for name in tuple(sys.modules):
|
|
if name == module_name or name.startswith(f"{module_name}."):
|
|
sys.modules.pop(name, None)
|