MrSphay/odysseus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tests): call live tool_execution module in edit-file gate test

Browse Source 
Calls execute_tool_block through the live src.tool_execution module in the edit-file admin-gate test so the monkeypatched _owner_is_admin seam and the called function belong to the same module object. Fixes the scoped #2580 CI-order edit-file failure. Remaining Python failure is the unrelated cookbook fallback-chain environment test.
This commit is contained in:
Alexandre Teixeira
2026-06-04 23:22:02 +01:00
committed by GitHub
parent 134c608466
commit 795782917f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_edit_file.py
View File

@@ -11,7 +11,7 @@ from src.tool_security import (
is_public_blocked_tool, is_public_blocked_tool,
blocked_tools_for_owner, blocked_tools_for_owner,
) )
from src.tool_execution import _do_edit_file, execute_tool_block from src.tool_execution import _do_edit_file
from src.agent_tools import ToolBlock from src.agent_tools import ToolBlock
@@ -34,13 +34,20 @@ def test_blocked_tools_for_owner_includes_edit_file_for_non_admin(monkeypatch):
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_edit_file_blocked_at_execution_for_non_admin(monkeypatch): async def test_edit_file_blocked_at_execution_for_non_admin(monkeypatch):
# Execution-level gate: a non-admin owner must be refused even if the tool # Execution-level gate: a non-admin owner must be refused even if the tool
# reaches execute_tool_block. # reaches execute_tool_block. edit_file stays admin-gated by tool_security
# after #2684 (ALWAYS_AVAILABLE only changed advertisement, not execution).
#
# Resolve execute_tool_block from the live module object (te) rather than a
# top-level import: other test modules pop src.tool_execution from
# sys.modules and re-import it, so a stale top-level reference would call a
# different module's function than the one monkeypatch targets — silently
# bypassing the admin gate.
import src.tool_execution as te import src.tool_execution as te
monkeypatch.setattr(te, "_owner_is_admin", lambda owner: False) monkeypatch.setattr(te, "_owner_is_admin", lambda owner: False)
ws = tempfile.mkdtemp() ws = tempfile.mkdtemp()
p = os.path.join("/tmp", "ef_block.txt") p = os.path.join("/tmp", "ef_block.txt")
open(p, "w").write("a\n") open(p, "w").write("a\n")
_desc, result = await execute_tool_block( _desc, result = await te.execute_tool_block(
ToolBlock("edit_file", json.dumps({"path": p, "old_string": "a", "new_string": "b"})), ToolBlock("edit_file", json.dumps({"path": p, "old_string": "a", "new_string": "b"})),
owner="bob", owner="bob",
) )