Update tests

Signed-off-by: Damon P. Cortesi <[email protected]>

Author: dacort

src/spark_history_mcp/config/config.py

@@ -92,17 +92,6 @@ class Config(BaseSettings):
         env_file_encoding="utf-8",
     )
 
-    @classmethod
-    def from_file(cls, file_path: str) -> "Config":
-        """Load configuration from a YAML file."""
-        if not os.path.exists(file_path):
-            return Config()
-
-        with open(file_path, "r") as f:
-            config_data = yaml.safe_load(f)
-
-        return cls.model_validate(config_data)
-
     @classmethod
     def settings_customise_sources(
         cls,

tests/emr/test_emr_integration.py

@@ -63,9 +63,9 @@ def test_spark_client_with_emr_session(self, mock_initialize):
         self.assertEqual(apps, [])
 
     @patch("spark_history_mcp.core.app.EMRPersistentUIClient")
-    @patch("spark_history_mcp.core.app.Config.from_file")
+    @patch("spark_history_mcp.core.app.Config")
     def test_app_lifespan_with_emr_config(
-        self, mock_config_from_file, mock_emr_client_class
+        self, mock_config_class, mock_emr_client_class
     ):
         """Test app_lifespan context manager with EMR configuration."""
         import asyncio
@@ -97,7 +97,7 @@ def test_app_lifespan_with_emr_config(
                 emr_cluster_arn=self.emr_cluster_arn, default=True, verify_ssl=True
             )
         }
-        mock_config_from_file.return_value = mock_config
+        mock_config_class.return_value = mock_config
 
         # Use the app_lifespan context manager
         async def test_lifespan():

tests/unit/config.py

@@ -39,8 +39,9 @@ def test_config_from_file(self):
             temp_file_path = temp_file.name
 
         try:
-            # Load config from the file
-            config = Config.from_file(temp_file_path)
+            # Load config from the file using SHS_MCP_CONFIG env var
+            with patch.dict(os.environ, {"SHS_MCP_CONFIG": temp_file_path}):
+                config = Config()
 
             # Verify the loaded configuration
             self.assertEqual(config.mcp.address, "test_host")
@@ -63,9 +64,10 @@ def test_config_from_file(self):
             os.unlink(temp_file_path)
 
     def test_nonexistent_config_file(self):
-        """Test behavior when config file doesn't exist."""
+        """Test behavior when explicitly specified config file doesn't exist."""
         with self.assertRaises(FileNotFoundError):
-            Config.from_file("nonexistent_file.yaml")
+            with patch.dict(os.environ, {"SHS_MCP_CONFIG": "nonexistent_file.yaml"}):
+                Config()
 
     @patch.dict(
         os.environ,
@@ -89,7 +91,8 @@ def test_config_from_env_vars(self):
             temp_file_path = temp_file.name
 
         try:
-            config = Config.from_file(temp_file_path)
+            with patch.dict(os.environ, {"SHS_MCP_CONFIG": temp_file_path}):
+                config = Config()
 
             # Verify MCP config from env vars
             self.assertEqual(config.mcp.address, "env_host")
@@ -122,7 +125,8 @@ def test_env_vars_override_file_config(self):
             temp_file_path = temp_file.name
 
         try:
-            config = Config.from_file(temp_file_path)
+            with patch.dict(os.environ, {"SHS_MCP_CONFIG": temp_file_path}):
+                config = Config()
 
             # Verify that env vars override file config
             self.assertEqual(config.mcp.address, "override_host")
@@ -147,7 +151,8 @@ def test_default_values(self):
             temp_file_path = temp_file.name
 
         try:
-            config = Config.from_file(temp_file_path)
+            with patch.dict(os.environ, {"SHS_MCP_CONFIG": temp_file_path}):
+                config = Config()
 
             # Check MCP defaults
             self.assertEqual(config.mcp.address, "localhost")