f6938b37f3
tools/terminal_tool.py: drop 30 pure re-export names (lifecycle/config/backends/
sudo/guards/result/interrupt/utils/_DockerEnvironment/is_managed_tool_gateway_ready)
and the noqa-F401 comments on the 25 names the facade itself uses. Sibling modules
(terminal_tool_backends/_result/_sudo/_lifecycle, environments/base, process_registry)
that read removed names through the facade now import from the defining module.
tools/environments/base.py: drop 11 re-exports (base_output/base_session_env/
path_utils) and the BaseEnvironment.stop() compat alias (no in-tree caller; the
lifecycle hasattr(env, 'stop') fallback stays for third-party envs).
tools/environments/docker.py: drop 1 re-export + the re-export comment.
Callers/tests repointed to tools.terminal_tool_{lifecycle,backends,sudo,config,
guards,result}, tools.interrupt, tools.environments.{base_output,base_session_env,
path_utils}.
48 lines
1.5 KiB
Python
48 lines
1.5 KiB
Python
"""Regression tests for MCP error messages when str(exc) is empty.
|
|
|
|
Issue #19417: ClosedResourceError (and similar exceptions raised without a
|
|
message argument) produced ``MCP call failed: ClosedResourceError: `` with
|
|
nothing after the colon, making debugging impossible.
|
|
|
|
Fix: ``_exc_str()`` falls back to ``repr(exc)`` when ``str(exc)`` is empty.
|
|
"""
|
|
|
|
|
|
from tools.mcp_tool_common import _exc_str, _sanitize_error
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _exc_str unit tests
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class _EmptyMessageError(Exception):
|
|
"""Exception whose __str__ returns empty string (like anyio.ClosedResourceError)."""
|
|
|
|
def __str__(self):
|
|
return ""
|
|
|
|
|
|
class _NormalError(Exception):
|
|
pass
|
|
|
|
|
|
def test_exc_str_returns_str_when_nonempty():
|
|
exc = _NormalError("something broke")
|
|
assert _exc_str(exc) == "something broke"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Integration: error message format in _sanitize_error
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_error_message_preserves_normal_exception_text():
|
|
"""Normal exceptions should still show their message text."""
|
|
exc = _NormalError("connection refused")
|
|
error_msg = _sanitize_error(
|
|
f"MCP call failed: {type(exc).__name__}: {_exc_str(exc)}"
|
|
)
|
|
assert "connection refused" in error_msg
|
|
assert "_NormalError" in error_msg
|