fix(plugin): close cancellation compensation gaps

This commit is contained in:
InfinityPacer
2026-08-23 14:47:17 +08:00
parent 14ec4c6eae
commit 3fa8ddf63a
4 changed files with 212 additions and 24 deletions
+87
View File
@@ -1774,6 +1774,93 @@ demo = { index = "private" }
):
asyncio.run(run_install())
def test_constraints_created_during_cancellation_are_removed(self, tmp_path):
"""约束文件创建线程收口后仍须响应取消并删除临时文件。"""
from app.adapters.external.market import PluginHelper
helper = PluginHelper()
requirements_file = tmp_path / "requirements.txt"
requirements_file.write_text("demo-package\n", encoding="utf-8")
constraints_file = tmp_path / "runtime-constraints.txt"
created = threading.Event()
release = threading.Event()
def create_constraints(_protected_packages):
constraints_file.write_text("fastapi==0\n", encoding="utf-8")
created.set()
release.wait(timeout=2)
return constraints_file
async def run_install():
task = asyncio.create_task(
helper.async_install_packages_with_fallback(requirements_file)
)
assert await asyncio.to_thread(created.wait, 2)
task.cancel()
release.set()
with pytest.raises(asyncio.CancelledError):
await task
with patch.object(
PluginHelper,
"_PluginHelper__get_installed_packages",
return_value={},
), patch.object(
PluginHelper,
"_PluginHelper__get_protected_runtime_packages",
return_value={"fastapi": "0"},
), patch.object(
PluginHelper,
"_PluginHelper__validate_runtime_dependency_conflicts",
return_value=(True, ""),
), patch.object(
PluginHelper,
"_PluginHelper__create_runtime_constraints_file",
side_effect=create_constraints,
):
asyncio.run(run_install())
assert not constraints_file.exists()
def test_constraints_cleanup_failure_preserves_cancellation(self, tmp_path):
"""临时文件删除失败只记录日志,不得替换调用方的取消异常。"""
from app.adapters.external.market import PluginHelper
constraints_file = tmp_path / "runtime-constraints.txt"
created = threading.Event()
release = threading.Event()
def create_constraints(_protected_packages):
constraints_file.write_text("fastapi==0\n", encoding="utf-8")
created.set()
release.wait(timeout=2)
return constraints_file
async def run_create():
task = asyncio.create_task(
PluginHelper._PluginHelper__async_create_runtime_constraints_file(
{"fastapi": Version("0")}
)
)
assert await asyncio.to_thread(created.wait, 2)
task.cancel()
release.set()
with pytest.raises(asyncio.CancelledError):
await task
with patch.object(
PluginHelper,
"_PluginHelper__create_runtime_constraints_file",
side_effect=create_constraints,
), patch.object(
Path,
"unlink",
side_effect=PermissionError("locked"),
), patch("app.adapters.external.market.logger.warning") as warning:
asyncio.run(run_create())
warning.assert_called_once()
def test_install_uses_release_package_when_asset_is_available(self, monkeypatch):
"""
release 包可用时优先使用 zip 安装,不再额外访问文件列表。
+37 -1
View File
@@ -1,5 +1,5 @@
import asyncio
from unittest.mock import AsyncMock, Mock
from unittest.mock import AsyncMock, Mock, patch
import pytest
@@ -156,6 +156,42 @@ async def test_existing_plugin_checks_compatibility_without_reinstalling_package
checkpointer.assert_not_awaited()
@pytest.mark.asyncio
async def test_cancelled_existing_plugin_refresh_restores_runtime_and_registrations():
"""已存在插件刷新被取消时,必须重新收敛运行态和注册。"""
registration_started = asyncio.Event()
calls: list[str] = []
async def reload_plugin(_plugin_id: str) -> None:
calls.append("reload")
async def refresh_registrations(_plugin_id: str) -> None:
calls.append("registrations")
if calls.count("registrations") == 1:
registration_started.set()
await asyncio.Event().wait()
with patch("app.application.plugin.install.logger.warning") as warning:
task = asyncio.create_task(
_command(
installed=["DemoPlugin"],
plugin_ids=["DemoPlugin"],
reloader=reload_plugin,
refresher=refresh_registrations,
).execute(
plugin_id="DemoPlugin",
repo_url="https://github.com/demo/plugins",
)
)
await registration_started.wait()
task.cancel()
with pytest.raises(asyncio.CancelledError):
await task
assert calls == ["reload", "registrations", "reload", "registrations"]
warning.assert_not_called()
@pytest.mark.asyncio
async def test_persistence_failure_restores_package_without_touching_runtime():
"""已安装列表保存失败时恢复文件,且运行态尚未开始切换。"""