From 151e8d896ca2296eeb836097bdb8049e70ef40f0 Mon Sep 17 00:00:00 2001
From: 0xbyt4 <35742124+0xbyt4@users.noreply.github.com>
Date: Mon, 2 Mar 2026 21:38:01 +0300
Subject: [PATCH] fix(tests): isolate discover_mcp_tools tests from global
 _servers state

Patch _servers to empty dict in tests that call discover_mcp_tools()
with mocked config, preventing interference from real MCP connections
that may exist when running within the full test suite.
---
 tests/tools/test_mcp_tool.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/tools/test_mcp_tool.py b/tests/tools/test_mcp_tool.py
index f12a6c937..2e52272b3 100644
--- a/tests/tools/test_mcp_tool.py
+++ b/tests/tools/test_mcp_tool.py
@@ -461,11 +461,14 @@ class TestMCPServerTask:
 class TestToolsetInjection:
     def test_mcp_tools_added_to_platform_toolsets(self):
         """Discovered MCP tools are injected into hermes-cli and platform toolsets."""
-        from tools.mcp_tool import _servers, MCPServerTask
+        from tools.mcp_tool import MCPServerTask
 
         mock_tools = [_make_mcp_tool("list_files", "List files")]
         mock_session = MagicMock()
 
+        # Fresh _servers dict to bypass idempotency guard
+        fresh_servers = {}
+
         async def fake_connect(name, config):
             server = MCPServerTask(name)
             server.session = mock_session
@@ -481,6 +484,7 @@ class TestToolsetInjection:
         }
 
         with patch("tools.mcp_tool._MCP_AVAILABLE", True), \
+             patch("tools.mcp_tool._servers", fresh_servers), \
              patch("tools.mcp_tool._load_mcp_config", return_value=fake_config), \
              patch("tools.mcp_tool._connect_server", side_effect=fake_connect), \
              patch("toolsets.TOOLSETS", fake_toolsets):
@@ -493,15 +497,15 @@ class TestToolsetInjection:
         # Original tools preserved
         assert "terminal" in fake_toolsets["hermes-cli"]["tools"]
 
-        _servers.pop("fs", None)
-
     def test_server_connection_failure_skipped(self):
         """If one server fails to connect, others still proceed."""
-        from tools.mcp_tool import _servers, MCPServerTask
+        from tools.mcp_tool import MCPServerTask
 
         mock_tools = [_make_mcp_tool("ping", "Ping")]
         mock_session = MagicMock()
 
+        # Fresh _servers dict to bypass idempotency guard
+        fresh_servers = {}
         call_count = 0
 
         async def flaky_connect(name, config):
@@ -523,6 +527,7 @@ class TestToolsetInjection:
         }
 
         with patch("tools.mcp_tool._MCP_AVAILABLE", True), \
+             patch("tools.mcp_tool._servers", fresh_servers), \
              patch("tools.mcp_tool._load_mcp_config", return_value=fake_config), \
              patch("tools.mcp_tool._connect_server", side_effect=flaky_connect), \
              patch("toolsets.TOOLSETS", fake_toolsets):
@@ -534,8 +539,6 @@ class TestToolsetInjection:
         assert "mcp_broken_ping" not in result
         assert call_count == 2  # Both were attempted
 
-        _servers.pop("good", None)
-
 
 # ---------------------------------------------------------------------------
 # Graceful fallback
@@ -552,6 +555,7 @@ class TestGracefulFallback:
     def test_no_servers_returns_empty(self):
         """No MCP servers configured -> empty list."""
         with patch("tools.mcp_tool._MCP_AVAILABLE", True), \
+             patch("tools.mcp_tool._servers", {}), \
              patch("tools.mcp_tool._load_mcp_config", return_value={}):
             from tools.mcp_tool import discover_mcp_tools
             result = discover_mcp_tools()