Fix lint and type-checker issues

- Add ClassVar import to tests for proper type annotations
- Add type ignore comment for crewai_tools import to suppress mypy error
- Fix line length violations by breaking long assert statements
- Add ClassVar annotations for mutable class attributes in test classes

Co-Authored-By: João <joao@crewai.com>

src/crewai/project/crew_base.py

@@ -1,7 +1,7 @@
 import inspect
 import logging
 from pathlib import Path
-from typing import Any, Callable, Dict, TypeVar, cast, List
+from typing import Any, Callable, Dict, TypeVar, cast, List, Optional
 from crewai.tools import BaseTool
 
 import yaml
@@ -86,15 +86,15 @@ def CrewBase(cls: T) -> T:
             import types
             return types.MethodType(_close_mcp_server, self)
 
-        def get_mcp_tools(self, *tool_names: list[str]) -> List[BaseTool]:
+        def get_mcp_tools(self, *tool_names: list[str], connect_timeout: Optional[int] = 30) -> List[BaseTool]:
             if not self.mcp_server_params:
                 return []
 
-            from crewai_tools import MCPServerAdapter
+            from crewai_tools import MCPServerAdapter  # type: ignore[import-untyped]
 
             adapter = getattr(self, '_mcp_server_adapter', None)
             if not adapter:
-                self._mcp_server_adapter = MCPServerAdapter(self.mcp_server_params)
+                self._mcp_server_adapter = MCPServerAdapter(self.mcp_server_params, connect_timeout=connect_timeout)
 
             return self._mcp_server_adapter.tools.filter_by_names(tool_names or None)
 

tests/test_project.py

@@ -1,4 +1,5 @@
 from typing import List
+from typing import ClassVar
 from unittest.mock import Mock, patch
 import pytest
 
@@ -284,4 +285,59 @@ def test_internal_crew_with_mcp():
         assert crew.reporting_analyst().tools == [simple_tool, another_simple_tool]
         assert crew.researcher().tools == [simple_tool]
 
-    adapter_mock.assert_called_once_with({"host": "localhost", "port": 8000})
+    adapter_mock.assert_called_once_with(
+        {"host": "localhost", "port": 8000}, connect_timeout=30
+    )
+
+def test_internal_crew_with_mcp_custom_timeout():
+    with patch("embedchain.client.Client.setup"):
+        from crewai_tools import MCPServerAdapter
+        from crewai_tools.adapters.mcp_adapter import ToolCollection
+
+    @CrewBase
+    class CrewWithCustomTimeout(InternalCrew):
+        mcp_server_params: ClassVar = {"host": "localhost", "port": 8000}
+
+        @agent
+        def test_agent(self):
+            return Agent(
+                config=self.agents_config["researcher"],
+                tools=self.get_mcp_tools("simple_tool", connect_timeout=60),
+            )
+
+    mock = Mock(spec=MCPServerAdapter)
+    mock.tools = ToolCollection([simple_tool])
+    with patch("crewai_tools.MCPServerAdapter", return_value=mock) as adapter_mock:
+        crew = CrewWithCustomTimeout()
+        assert crew.test_agent().tools == [simple_tool]
+
+    adapter_mock.assert_called_once_with(
+        {"host": "localhost", "port": 8000}, connect_timeout=60
+    )
+
+
+def test_internal_crew_with_mcp_backward_compatibility():
+    with patch("embedchain.client.Client.setup"):
+        from crewai_tools import MCPServerAdapter
+        from crewai_tools.adapters.mcp_adapter import ToolCollection
+
+    @CrewBase
+    class CrewWithoutTimeout(InternalCrew):
+        mcp_server_params: ClassVar = {"host": "localhost", "port": 8000}
+
+        @agent
+        def test_agent(self):
+            return Agent(
+                config=self.agents_config["researcher"],
+                tools=self.get_mcp_tools("simple_tool"),
+            )
+
+    mock = Mock(spec=MCPServerAdapter)
+    mock.tools = ToolCollection([simple_tool])
+    with patch("crewai_tools.MCPServerAdapter", return_value=mock) as adapter_mock:
+        crew = CrewWithoutTimeout()
+        assert crew.test_agent().tools == [simple_tool]
+
+    adapter_mock.assert_called_once_with(
+        {"host": "localhost", "port": 8000}, connect_timeout=30
+    )