Merge pull request #848 from microsoft/psl-code-quality

fix: Improve the code quality

Author: Roopan-Microsoft

src/tests/backend/common/config/test_app_config.py

@@ -12,7 +12,7 @@
 import pytest
 import os
 import logging
-from unittest.mock import patch, MagicMock, AsyncMock
+from unittest.mock import patch, MagicMock
 
 # Add the source root directory to the Python path for imports
 import sys

src/tests/backend/common/database/test_database_base.py

@@ -499,7 +499,7 @@ async def get_team_agent(self, team_id, agent_name): return None
                 assert database.initialized is True
                 # Raise an exception to test cleanup
                 raise ValueError("Test exception")
-        
+
         # Even with exception, close should have been called
         assert database.closed is True
 

src/tests/backend/common/utils/test_utils_date.py

@@ -106,6 +106,8 @@ def tearDown(self):
             else:
                 locale.setlocale(locale.LC_TIME, "")
         except Exception:
+            # Best-effort cleanup: if restoring the locale fails (e.g., unsupported locale),
+            # do not fail tests because of the environment configuration.
             pass
 
     def test_format_date_for_user_valid_iso_date(self):

src/tests/backend/v4/common/services/test_plan_service.py

@@ -529,18 +529,34 @@ async def test_static_method_properties(self):
             result = await PlanService.handle_plan_approval(mock_approval, "user")
             assert result is False
 
-    def test_event_tracking_calls(self):
+    @pytest.mark.asyncio
+    async def test_event_tracking_calls(self):
         """Test that event tracking is called appropriately."""
-        # This test verifies the event tracking integration
-        with patch.object(mock_event_utils, 'track_event_if_configured') as mock_track:
+        # Seed orchestration plan + memory store so approval path reaches event tracking.
+        mock_mplan = MagicMock()
+        mock_mplan.plan_id = None
+        mock_mplan.team_id = None
+        mock_mplan.model_dump.return_value = {"test": "plan"}
+        mock_orchestration_config.plans = {"test-m-plan": mock_mplan}
+
+        mock_plan = MagicMock()
+        mock_plan.team_id = "team-123"
+        mock_db = MagicMock()
+        mock_db.get_plan = AsyncMock(return_value=mock_plan)
+        mock_db.update_plan = AsyncMock()
+        mock_database_factory.DatabaseFactory.get_database = AsyncMock(return_value=mock_db)
+
+        with patch.object(plan_service_module, 'track_event_if_configured') as mock_track:
             mock_approval = MockPlanApprovalResponse(
                 plan_id="test-plan",
                 m_plan_id="test-m-plan",
                 approved=True
             )
-            
-            # The actual event tracking calls are tested indirectly through the service methods
-            assert mock_track is not None
+
+            result = await PlanService.handle_plan_approval(mock_approval, "user")
+            assert result is True
+            # Verify that event tracking was invoked
+            mock_track.assert_called_once()
 
     def test_logging_integration(self):
         """Test that logging is properly configured."""

src/tests/backend/v4/config/test_settings.py

@@ -75,6 +75,7 @@ def test_ad_token_provider(self, mock_config):
         self.assertEqual(token, "test-token-123")
         mock_credential.get_token.assert_called_once_with(mock_config.AZURE_COGNITIVE_SERVICES)
 
+
 class TestAzureConfigAsync(unittest.IsolatedAsyncioTestCase):
     """Async test cases for AzureConfig class."""
 

src/tests/backend/v4/magentic_agents/common/test_lifecycle.py

@@ -1,5 +1,4 @@
 """Unit tests for backend.v4.magentic_agents.common.lifecycle module."""
-import asyncio
 import logging
 import sys
 from unittest.mock import Mock, patch, AsyncMock

src/tests/backend/v4/magentic_agents/test_proxy_agent.py

@@ -55,9 +55,13 @@
 sys.modules['v4.models.messages'].TimeoutNotification = mock_timeout_notification
 sys.modules['v4.models.messages'].WebsocketMessageType = mock_websocket_message_type
 
-
 # Now import the module under test
-import backend.v4.magentic_agents.proxy_agent
+import backend.v4.magentic_agents.proxy_agent as proxy_agent_module
+
+
+def test_module_imports():
+    """Ensure the proxy_agent module imports correctly and is referenced in tests."""
+    assert proxy_agent_module is not None
 
 
 class TestProxyAgentComplexScenarios:

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

@@ -7,7 +7,7 @@
 import logging
 import os
 import sys
-from unittest import IsolatedAsyncioTestCase
+from unittest import IsolatedAsyncioTestCase, main
 from unittest.mock import AsyncMock, Mock, patch
 
 # Add the backend directory to the Python path
@@ -1159,5 +1159,4 @@ async def test_workflow_output_with_empty_list(self):
 
 
 if __name__ == '__main__':
-    import unittest
-    unittest.main()
+    main()

tests/e2e-test/tests/test_MACAE_Smoke_test.py

@@ -106,7 +106,6 @@ def test_macae_v4_gp_workflow(login_logout, request):
         logger.info("STEP 5: Approving Retail Task Plan")
         logger.info("=" * 80)
         step5_start = time.time()
-        step5_retry_attempted = False
         try:
             biab_page.approve_retail_task_plan()
             step5_end = time.time()