tests(cli): fix broken tests

Author: Davidyz

tests/test_mcp.py

@@ -1,7 +1,6 @@
 import os
 import tempfile
 from argparse import ArgumentParser
-from contextlib import asynccontextmanager
 from unittest.mock import AsyncMock, MagicMock, mock_open, patch
 
 import pytest
@@ -22,12 +21,12 @@
 async def test_list_collections_success():
     with (
         patch("vectorcode.mcp_main.get_collections") as mock_get_collections,
-        patch("vectorcode.common.ClientManager") as MockClientManager,
+        patch("vectorcode.common.try_server", return_value=True),
     ):
+        from vectorcode.mcp_main import ClientManager
+
         mock_client = AsyncMock()
-        MockClientManager.return_value._create_client = AsyncMock(
-            return_value=mock_client
-        )
+        ClientManager._create_client = AsyncMock(return_value=mock_client)
 
         mock_collection1 = AsyncMock()
         mock_collection1.metadata = {"path": "path1"}
@@ -48,12 +47,13 @@ async def async_generator():
 async def test_list_collections_no_metadata():
     with (
         patch("vectorcode.mcp_main.get_collections") as mock_get_collections,
-        patch("vectorcode.common.ClientManager") as MockClientManager,
+        patch("vectorcode.common.try_server", return_value=True),
     ):
+        from vectorcode.mcp_main import ClientManager
+
         mock_client = AsyncMock()
-        MockClientManager.return_value._create_client = asynccontextmanager(
-            AsyncMock(return_value=mock_client)
-        )
+        ClientManager._create_client = AsyncMock(return_value=mock_client)
+
         mock_collection1 = AsyncMock()
         mock_collection1.metadata = {"path": "path1"}
         mock_collection2 = AsyncMock()
@@ -93,19 +93,19 @@ async def test_query_tool_success():
         patch(
             "vectorcode.subcommands.query.get_query_result_files"
         ) as mock_get_query_result_files,
+        patch("vectorcode.common.try_server", return_value=True),
         patch("builtins.open", create=True) as mock_open,
         patch("os.path.isfile", return_value=True),
         patch("os.path.relpath", return_value="rel/path.py"),
         patch("vectorcode.cli_utils.load_config_file") as mock_load_config_file,
-        patch("vectorcode.common.ClientManager") as MockClientManager,
     ):
+        from vectorcode.mcp_main import ClientManager
+
         mock_config = Config(chunk_size=100, overlap_ratio=0.1, reranker=None)
         mock_load_config_file.return_value = mock_config
         mock_get_project_config.return_value = mock_config
         mock_client = AsyncMock()
-        MockClientManager.return_value._create_client = AsyncMock(
-            return_value=mock_client
-        )
+        ClientManager._create_client = AsyncMock(return_value=mock_client)
 
         # Mock the collection's query method to return a valid QueryResult
         mock_collection = AsyncMock()
@@ -139,13 +139,13 @@ async def test_query_tool_collection_access_failure():
         patch("os.path.isdir", return_value=True),
         patch("vectorcode.mcp_main.get_project_config"),
         patch("vectorcode.mcp_main.get_collection"),  # Still mock get_collection
-        patch("vectorcode.common.ClientManager") as MockClientManager,
     ):
+        from vectorcode.mcp_main import ClientManager
 
         async def failing_get_client(*args, **kwargs):
             raise Exception("Failed to connect")
 
-        MockClientManager.return_value._create_client.side_effect = failing_get_client
+        ClientManager._create_client = AsyncMock(side_effect=failing_get_client)
 
         with pytest.raises(McpError) as exc_info:
             await query_tool(
@@ -169,7 +169,8 @@ async def test_query_tool_no_collection():
         ) as mock_get_collection,  # Still mock get_collection
         patch("vectorcode.common.ClientManager") as MockClientManager,
     ):
-        MockClientManager.return_value._create_client.return_value = AsyncMock()
+        mock_client = AsyncMock()
+        MockClientManager.return_value._create_client.return_value = mock_client
         mock_get_collection.return_value = None
 
         with pytest.raises(McpError) as exc_info:
@@ -201,23 +202,23 @@ async def test_vectorise_files_success():
             f.write("def func(): pass")
 
         with (
-            patch("vectorcode.common.ClientManager") as MockClientManager,
             patch("os.path.isdir", return_value=True),
             patch("vectorcode.mcp_main.get_project_config") as mock_get_project_config,
             patch("vectorcode.mcp_main.get_collection") as mock_get_collection,
             patch("vectorcode.subcommands.vectorise.chunked_add"),
             patch(
                 "vectorcode.subcommands.vectorise.hash_file", return_value="test_hash"
             ),
+            patch("vectorcode.common.try_server", return_value=True),
         ):
+            from vectorcode.mcp_main import ClientManager
+
             mock_config = Config(project_root=temp_dir)
             mock_get_project_config.return_value = mock_config
             mock_client = AsyncMock()
 
             # Ensure ClientManager's internal client creation method returns our mock.
-            MockClientManager.return_value._create_client = AsyncMock(
-                return_value=mock_client
-            )
+            ClientManager._create_client = AsyncMock(return_value=mock_client)
 
             mock_collection = AsyncMock()
             mock_collection.get.return_value = {"ids": [], "metadatas": []}
@@ -233,21 +234,16 @@ async def test_vectorise_files_success():
 
 
 @pytest.mark.asyncio
-async def test_vectorise_files_collection_access_failure():  # Removed client_manager fixture
+async def test_vectorise_files_collection_access_failure():
     with (
         patch("os.path.isdir", return_value=True),
         patch("vectorcode.mcp_main.get_project_config"),
-        # patch("vectorcode.mcp_main.get_client", side_effect=Exception("Client error")), # Removed explicit patch
-        patch(
-            "vectorcode.common.ClientManager"
-        ) as MockClientManager,  # Patch ClientManager class
+        patch("vectorcode.common.ClientManager"),  # Patch ClientManager class
         patch("vectorcode.mcp_main.get_collection"),
     ):
+        from vectorcode.mcp_main import ClientManager
 
-        async def failing_get_client(*args, **kwargs):
-            raise Exception("Client error")
-
-        MockClientManager.return_value._create_client = failing_get_client
+        ClientManager._create_client = AsyncMock(side_effect=Exception("Client error"))
 
         with pytest.raises(McpError) as exc_info:
             await vectorise_files(paths=["file.py"], project_root="/valid/path")
@@ -296,14 +292,14 @@ def mock_open_side_effect(filename, *args, **kwargs):
                 "os.path.isfile",
                 side_effect=lambda x: x in [file1, excluded_file, exclude_spec_file],
             ),
-            patch("vectorcode.common.ClientManager") as MockClientManager,
+            patch("vectorcode.common.try_server", return_value=True),
         ):
+            from vectorcode.mcp_main import ClientManager
+
             mock_config = Config(project_root=temp_dir)
             mock_get_project_config.return_value = mock_config
             mock_client = AsyncMock()
-            MockClientManager.return_value._create_client = AsyncMock(
-                return_value=mock_client
-            )
+            ClientManager._create_client = AsyncMock(return_value=mock_client)
 
             mock_collection = AsyncMock()
             mock_collection.get.return_value = {"ids": [], "metadatas": []}
@@ -330,13 +326,15 @@ async def test_mcp_server():
         # patch("vectorcode.mcp_main.get_client") as mock_get_client, # Removed
         patch("vectorcode.mcp_main.get_collection") as mock_get_collection,
         patch("mcp.server.fastmcp.FastMCP.add_tool") as mock_add_tool,
-        patch("vectorcode.common.ClientManager") as MockClientManager,  # Added
+        patch("vectorcode.common.try_server", return_value=True),
     ):
+        from vectorcode.mcp_main import ClientManager
+
         mock_find_project_config_dir.return_value = "/path/to/config"
         mock_load_config_file.return_value = Config(project_root="/path/to/project")
         mock_client = AsyncMock()
 
-        MockClientManager.return_value.get_client = AsyncMock(return_value=mock_client)
+        ClientManager._create_client = AsyncMock(return_value=mock_client)
         mock_collection = AsyncMock()
         mock_get_collection.return_value = mock_collection
 
@@ -347,30 +345,29 @@ async def test_mcp_server():
 
 @pytest.mark.asyncio
 async def test_mcp_server_ls_on_start():
+    mock_collection = AsyncMock()
+
     with (
         patch(
             "vectorcode.mcp_main.find_project_config_dir"
         ) as mock_find_project_config_dir,
         patch("vectorcode.mcp_main.load_config_file") as mock_load_config_file,
-        # patch("vectorcode.mcp_main.get_client") as mock_get_client, # Removed
         patch("vectorcode.mcp_main.get_collection") as mock_get_collection,
         patch(
             "vectorcode.mcp_main.get_collections", spec=AsyncMock
         ) as mock_get_collections,
         patch("mcp.server.fastmcp.FastMCP.add_tool") as mock_add_tool,
-        patch("vectorcode.common.ClientManager") as MockClientManager,  # Added
+        patch("vectorcode.common.try_server", return_value=True),
     ):
-        from vectorcode.mcp_main import mcp_config
+        from vectorcode.mcp_main import ClientManager, mcp_config
 
         mcp_config.ls_on_start = True
         mock_find_project_config_dir.return_value = "/path/to/config"
         mock_load_config_file.return_value = Config(project_root="/path/to/project")
         mock_client = AsyncMock()
 
-        MockClientManager.return_value._create_client = AsyncMock(
-            return_value=mock_client
-        )
-        mock_collection = AsyncMock()
+        ClientManager._create_client = AsyncMock(return_value=mock_client)
+
         mock_collection.metadata = {"path": "/path/to/project"}
         mock_get_collection.return_value = mock_collection