fix(test): function signatures and environment variable interference

- Fix function signature mismatches in backup and direct management tests
- Update test calls to include required env_manager parameter for all handler functions
- Add proper import for ANY from unittest.mock to resolve import errors
- Resolve HATCH_AUTO_APPROVE environment variable interference in confirmation tests
- Add environment variable patching to ensure test isolation
- Create tests/__init__.py to enable proper test module imports

Resolves 9 ERROR cases from function signature mismatches.
Resolves 3 FAIL cases from environment variable interference.
Ensures test suite reliability and proper isolation between tests.

Author: LittleCoinCoin

tests/__init__.py

@@ -0,0 +1 @@
+"""Test package for Hatch MCP integration system."""

tests/test_mcp_cli_backup_management.py

@@ -11,7 +11,7 @@
 """
 
 import unittest
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock, ANY
 import sys
 from pathlib import Path
 from datetime import datetime
@@ -40,7 +40,7 @@ def test_backup_restore_argument_parsing(self):
                     try:
                         main()
                         mock_handler.assert_called_once_with(
-                            'claude-desktop', 'test.backup', False, False
+                            ANY, 'claude-desktop', 'test.backup', False, False
                         )
                     except SystemExit as e:
                         self.assertEqual(e.code, 0)
@@ -56,18 +56,19 @@ def test_backup_restore_dry_run_argument(self):
                     try:
                         main()
                         mock_handler.assert_called_once_with(
-                            'cursor', None, True, True
+                            ANY, 'cursor', None, True, True
                         )
                     except SystemExit as e:
                         self.assertEqual(e.code, 0)
 
     @integration_test(scope="component")
     def test_backup_restore_invalid_host(self):
         """Test backup restore with invalid host type."""
-        with patch('builtins.print') as mock_print:
-            result = handle_mcp_backup_restore('invalid-host')
-            
-            self.assertEqual(result, 1)
+        with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+            with patch('builtins.print') as mock_print:
+                result = handle_mcp_backup_restore(mock_env_manager.return_value, 'invalid-host')
+
+                self.assertEqual(result, 1)
 
             # Verify error message
             print_calls = [call[0][0] for call in mock_print.call_args_list]
@@ -81,10 +82,11 @@ def test_backup_restore_no_backups(self):
             mock_backup_manager._get_latest_backup.return_value = None
             mock_backup_class.return_value = mock_backup_manager
 
-            with patch('builtins.print') as mock_print:
-                result = handle_mcp_backup_restore('claude-desktop')
+            with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+                with patch('builtins.print') as mock_print:
+                    result = handle_mcp_backup_restore(mock_env_manager.return_value, 'claude-desktop')
 
-                self.assertEqual(result, 1)
+                    self.assertEqual(result, 1)
 
                 # Verify error message
                 print_calls = [call[0][0] for call in mock_print.call_args_list]
@@ -99,10 +101,11 @@ def test_backup_restore_dry_run(self):
             mock_backup_manager._get_latest_backup.return_value = mock_backup_path
             mock_backup_class.return_value = mock_backup_manager
 
-            with patch('builtins.print') as mock_print:
-                result = handle_mcp_backup_restore('claude-desktop', dry_run=True)
+            with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+                with patch('builtins.print') as mock_print:
+                    result = handle_mcp_backup_restore(mock_env_manager.return_value, 'claude-desktop', dry_run=True)
 
-                self.assertEqual(result, 0)
+                    self.assertEqual(result, 0)
 
                 # Verify dry run output
                 print_calls = [call[0][0] for call in mock_print.call_args_list]
@@ -119,10 +122,11 @@ def test_backup_restore_successful(self):
             mock_backup_class.return_value = mock_backup_manager
 
             with patch('hatch.cli_hatch.request_confirmation', return_value=True):
-                with patch('builtins.print') as mock_print:
-                    result = handle_mcp_backup_restore('claude-desktop', auto_approve=True)
+                with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+                    with patch('builtins.print') as mock_print:
+                        result = handle_mcp_backup_restore(mock_env_manager.return_value, 'claude-desktop', auto_approve=True)
 
-                    self.assertEqual(result, 0)
+                        self.assertEqual(result, 0)
                     mock_backup_manager.restore_backup.assert_called_once()
 
                     # Verify success message

tests/test_mcp_cli_direct_management.py

@@ -10,7 +10,7 @@
 """
 
 import unittest
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock, ANY
 import sys
 from pathlib import Path
 
@@ -218,7 +218,7 @@ def test_remove_argument_parsing(self):
                 with patch('hatch.cli_hatch.handle_mcp_remove_server', return_value=0) as mock_handler:
                     try:
                         main()
-                        mock_handler.assert_called_once_with('old-server', 'vscode', None, True, False, True)
+                        mock_handler.assert_called_once_with(ANY, 'old-server', 'vscode', None, True, False, True)
                     except SystemExit as e:
                         self.assertEqual(e.code, 0)
 
@@ -317,7 +317,7 @@ def test_remove_server_argument_parsing(self):
                 with patch('hatch.cli_hatch.handle_mcp_remove_server', return_value=0) as mock_handler:
                     try:
                         main()
-                        mock_handler.assert_called_once_with('test-server', 'claude-desktop', None, True, False, False)
+                        mock_handler.assert_called_once_with(ANY, 'test-server', 'claude-desktop', None, True, False, False)
                     except SystemExit as e:
                         self.assertEqual(e.code, 0)
 
@@ -329,10 +329,11 @@ def test_remove_server_multi_host(self):
             mock_manager.remove_server.return_value = MagicMock(success=True, backup_path=None)
             mock_manager_class.return_value = mock_manager
 
-            with patch('builtins.print') as mock_print:
-                result = handle_mcp_remove_server('test-server', 'claude-desktop,cursor', auto_approve=True)
+            with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+                with patch('builtins.print') as mock_print:
+                    result = handle_mcp_remove_server(mock_env_manager.return_value, 'test-server', 'claude-desktop,cursor', auto_approve=True)
 
-                self.assertEqual(result, 0)
+                    self.assertEqual(result, 0)
                 self.assertEqual(mock_manager.remove_server.call_count, 2)
 
                 # Verify success messages
@@ -343,10 +344,11 @@ def test_remove_server_multi_host(self):
     @integration_test(scope="component")
     def test_remove_server_no_host_specified(self):
         """Test remove server with no host specified."""
-        with patch('builtins.print') as mock_print:
-            result = handle_mcp_remove_server('test-server')
+        with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+            with patch('builtins.print') as mock_print:
+                result = handle_mcp_remove_server(mock_env_manager.return_value, 'test-server')
 
-            self.assertEqual(result, 1)
+                self.assertEqual(result, 1)
 
             # Verify error message
             print_calls = [call[0][0] for call in mock_print.call_args_list]
@@ -355,10 +357,11 @@ def test_remove_server_no_host_specified(self):
     @integration_test(scope="component")
     def test_remove_server_dry_run(self):
         """Test remove server dry run functionality."""
-        with patch('builtins.print') as mock_print:
-            result = handle_mcp_remove_server('test-server', 'claude-desktop', dry_run=True)
+        with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+            with patch('builtins.print') as mock_print:
+                result = handle_mcp_remove_server(mock_env_manager.return_value, 'test-server', 'claude-desktop', dry_run=True)
 
-            self.assertEqual(result, 0)
+                self.assertEqual(result, 0)
 
             # Verify dry run output
             print_calls = [call[0][0] for call in mock_print.call_args_list]
@@ -378,7 +381,7 @@ def test_remove_host_argument_parsing(self):
                 with patch('hatch.cli_hatch.handle_mcp_remove_host', return_value=0) as mock_handler:
                     try:
                         main()
-                        mock_handler.assert_called_once_with('claude-desktop', False, False, True)
+                        mock_handler.assert_called_once_with(ANY, 'claude-desktop', False, False, True)
                     except SystemExit as e:
                         self.assertEqual(e.code, 0)
 
@@ -393,10 +396,11 @@ def test_remove_host_successful(self):
             mock_manager.remove_host_configuration.return_value = mock_result
             mock_manager_class.return_value = mock_manager
 
-            with patch('builtins.print') as mock_print:
-                result = handle_mcp_remove_host('claude-desktop', auto_approve=True)
+            with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+                with patch('builtins.print') as mock_print:
+                    result = handle_mcp_remove_host(mock_env_manager.return_value, 'claude-desktop', auto_approve=True)
 
-                self.assertEqual(result, 0)
+                    self.assertEqual(result, 0)
                 mock_manager.remove_host_configuration.assert_called_once_with(
                     hostname='claude-desktop', no_backup=False
                 )
@@ -408,10 +412,11 @@ def test_remove_host_successful(self):
     @integration_test(scope="component")
     def test_remove_host_invalid_host(self):
         """Test remove host with invalid host type."""
-        with patch('builtins.print') as mock_print:
-            result = handle_mcp_remove_host('invalid-host')
+        with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+            with patch('builtins.print') as mock_print:
+                result = handle_mcp_remove_host(mock_env_manager.return_value, 'invalid-host')
 
-            self.assertEqual(result, 1)
+                self.assertEqual(result, 1)
 
             # Verify error message
             print_calls = [call[0][0] for call in mock_print.call_args_list]
@@ -420,10 +425,11 @@ def test_remove_host_invalid_host(self):
     @integration_test(scope="component")
     def test_remove_host_dry_run(self):
         """Test remove host dry run functionality."""
-        with patch('builtins.print') as mock_print:
-            result = handle_mcp_remove_host('claude-desktop', dry_run=True)
+        with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env_manager:
+            with patch('builtins.print') as mock_print:
+                result = handle_mcp_remove_host(mock_env_manager.return_value, 'claude-desktop', dry_run=True)
 
-            self.assertEqual(result, 0)
+                self.assertEqual(result, 0)
 
             # Verify dry run output
             print_calls = [call[0][0] for call in mock_print.call_args_list]

tests/test_mcp_cli_package_management.py

@@ -115,23 +115,26 @@ def test_request_confirmation_user_yes_full(self):
     @regression_test
     def test_request_confirmation_user_no(self):
         """Test confirmation with user saying no."""
-        with patch('builtins.input', return_value='n'):
-            result = request_confirmation("Test message?", auto_approve=False)
-            self.assertFalse(result)
+        with patch.dict('os.environ', {'HATCH_AUTO_APPROVE': ''}, clear=False):
+            with patch('builtins.input', return_value='n'):
+                result = request_confirmation("Test message?", auto_approve=False)
+                self.assertFalse(result)
 
     @regression_test
     def test_request_confirmation_user_no_full(self):
         """Test confirmation with user saying 'no'."""
-        with patch('builtins.input', return_value='no'):
-            result = request_confirmation("Test message?", auto_approve=False)
-            self.assertFalse(result)
+        with patch.dict('os.environ', {'HATCH_AUTO_APPROVE': ''}, clear=False):
+            with patch('builtins.input', return_value='no'):
+                result = request_confirmation("Test message?", auto_approve=False)
+                self.assertFalse(result)
 
     @regression_test
     def test_request_confirmation_user_empty(self):
         """Test confirmation with user pressing enter (default no)."""
-        with patch('builtins.input', return_value=''):
-            result = request_confirmation("Test message?", auto_approve=False)
-            self.assertFalse(result)
+        with patch.dict('os.environ', {'HATCH_AUTO_APPROVE': ''}, clear=False):
+            with patch('builtins.input', return_value=''):
+                result = request_confirmation("Test message?", auto_approve=False)
+                self.assertFalse(result)
 
     @integration_test(scope="component")
     def test_package_add_argument_parsing(self):
@@ -208,8 +211,8 @@ def test_package_sync_argument_parsing(self):
                             # Should succeed
                             self.assertEqual(result, 0)
 
-                            # Should print dry run message
-                            mock_print.assert_any_call("[DRY RUN] Would synchronize MCP server for package 'test-package' to hosts: ['claude-desktop', 'cursor']")
+                            # Should print dry run message (new format includes dependency info)
+                            mock_print.assert_any_call("[DRY RUN] Would synchronize MCP servers for 1 package(s) to hosts: ['claude-desktop', 'cursor']")
 
     @integration_test(scope="component")
     def test_package_sync_package_not_found(self):
@@ -244,8 +247,8 @@ def test_package_sync_package_not_found(self):
                         # Should fail
                         self.assertEqual(result, 1)
 
-                        # Should print error message
-                        mock_print.assert_any_call("Error: Package 'nonexistent-package' not found in environment 'default'")
+                        # Should print error message (new format)
+                        mock_print.assert_any_call("Error: No MCP server configurations found for package 'nonexistent-package' or its dependencies")
 
     @regression_test
     def test_get_package_mcp_server_config_success(self):