test: enhance mock specifications in various test files for better clarity and error prevention

Author: Ayaz-Microsoft

src/tests/backend/test_app.py

@@ -13,7 +13,7 @@
 import pytest
 import sys
 import os
-from unittest.mock import Mock, AsyncMock, patch, MagicMock
+from unittest.mock import Mock, AsyncMock, patch, MagicMock, NonCallableMock
 from types import ModuleType
 
 # Environment variables are set by conftest.py, but ensure they're available
@@ -36,7 +36,8 @@
 os.environ.setdefault("AZURE_OPENAI_RAI_DEPLOYMENT_NAME", "test-rai-deployment")
 
 # Check if v4 has been mocked by another test file (prevents import errors)
-_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], (Mock, MagicMock))
+# Use NonCallableMock to catch all mock subclasses (Mock, MagicMock, etc.)
+_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], NonCallableMock)
 if _v4_is_mocked:
     # Skip this module - v4 has been mocked by another test file
     pytest.skip(

src/tests/backend/v4/orchestration/helper/test_plan_to_mplan_converter.py

@@ -11,13 +11,14 @@
 
 import unittest
 import sys
-from unittest.mock import Mock, MagicMock
+from unittest.mock import Mock, MagicMock, NonCallableMock
 
 import pytest
 
 # Check if v4 has been mocked by another test file (prevents import errors)
-_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], (Mock, MagicMock))
-_v4_models_is_mocked = 'v4.models' in sys.modules and isinstance(sys.modules['v4.models'], (Mock, MagicMock))
+# Use NonCallableMock to catch all mock subclasses (Mock, MagicMock, etc.)
+_v4_is_mocked = 'v4' in sys.modules and isinstance(sys.modules['v4'], NonCallableMock)
+_v4_models_is_mocked = 'v4.models' in sys.modules and isinstance(sys.modules['v4.models'], NonCallableMock)
 if _v4_is_mocked or _v4_models_is_mocked:
     pytest.skip(
         "Skipping test_plan_to_mplan_converter.py: v4 module has been mocked by another test file. "

src/tests/backend/v4/orchestration/test_orchestration_manager.py

@@ -924,7 +924,7 @@ def test_extract_response_text_object_with_empty_text(self):
 
     def test_extract_response_text_agent_executor_response_with_agent_response(self):
         """Test extracting text from AgentExecutorResponse with agent_response.text."""
-        agent_resp = Mock()
+        agent_resp = Mock(spec=['text'])
         agent_resp.text = "Agent executor response"
 
         executor_resp = Mock(spec=['agent_response'])
@@ -935,7 +935,7 @@ def test_extract_response_text_agent_executor_response_with_agent_response(self)
 
     def test_extract_response_text_agent_executor_response_fallback_to_conversation(self):
         """Test extracting text from AgentExecutorResponse falling back to full_conversation."""
-        agent_resp = Mock()
+        agent_resp = Mock(spec=['text'])
         agent_resp.text = None
 
         last_msg = MockChatMessage("Last conversation message")
@@ -949,7 +949,7 @@ def test_extract_response_text_agent_executor_response_fallback_to_conversation(
 
     def test_extract_response_text_agent_executor_response_empty_conversation(self):
         """Test extracting text from AgentExecutorResponse with empty conversation."""
-        agent_resp = Mock()
+        agent_resp = Mock(spec=['text'])
         agent_resp.text = None
 
         executor_resp = Mock(spec=['agent_response', 'full_conversation'])