Fix pytest for config

Signed-off-by: Mihai Criveti <[email protected]>

Author: crivetimihai

mcpgateway/config.py

@@ -9,8 +9,8 @@
 It loads configuration from environment variables with sensible defaults.
 
 Environment variables:
-- APP_NAME: Gateway name (default: "MCP Gateway")
-- HOST: Host to bind to (default: "0.0.0.0")
+- APP_NAME: Gateway name (default: "MCP_Gateway")
+- HOST: Host to bind to (default: "127.0.0.1")
 - PORT: Port to listen on (default: 4444)
 - DATABASE_URL: SQLite database URL (default: "sqlite:///./mcp.db")
 - BASIC_AUTH_USER: Admin username (default: "admin")
@@ -47,7 +47,7 @@ class Settings(BaseSettings):
     """MCP Gateway configuration settings."""
 
     # Basic Settings
-    app_name: str = Field("MCP Gateway", env="APP_NAME")
+    app_name: str = Field("MCP_Gateway", env="APP_NAME")
     host: str = Field("127.0.0.1", env="HOST")
     port: int = Field(4444, env="PORT")
     database_url: str = "sqlite:///./mcp.db"

tests/unit/mcpgateway/test_config.py

@@ -7,23 +7,29 @@
 
 """
 
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
 
 from mcpgateway.config import Settings, get_settings
 
 
 def test_settings_default_values():
-    """Test that Settings has expected default values."""
-    settings = Settings()
-    assert settings.app_name == "MCP Gateway"
-    assert settings.host == "0.0.0.0"
+    """
+    Verify the class defaults only, independent of anything in the
+    developer's local .env file. Passing ``_env_file=None`` tells
+    Pydantic not to load any environment file.
+    """
+    settings = Settings(_env_file=None)
+
+    assert settings.app_name == "MCP_Gateway"
+    assert settings.host == "127.0.0.1"
     assert settings.port == 4444
     assert settings.database_url == "sqlite:///./mcp.db"
     assert settings.basic_auth_user == "admin"
     assert settings.basic_auth_password == "changeme"
     assert settings.auth_required is True
 
 
+
 def test_api_key_property():
     """Test the api_key property."""
     settings = Settings(basic_auth_user="test_user", basic_auth_password="test_pass")
@@ -53,17 +59,35 @@ def test_supports_transport_properties():
 
 @patch("mcpgateway.config.Settings")
 def test_get_settings_caching(mock_settings):
-    """Test that get_settings caches the result."""
-    mock_settings.return_value = "test_settings"
+    """
+    Ensure get_settings() calls the Settings constructor exactly once and
+    then serves the cached object on every additional call.
+    """
+    # Clear the cache created at import-time.
+    get_settings.cache_clear()
+
+    # Two distinct mock Settings instances, each with the methods that
+    # get_settings() invokes (validate_transport / validate_database).
+    settings_instance_1 = MagicMock()
+    settings_instance_2 = MagicMock()
+
+    # Each mock must expose these methods so AttributeError is not raised.
+    settings_instance_1.validate_transport.return_value = None
+    settings_instance_1.validate_database.return_value = None
+    settings_instance_2.validate_transport.return_value = None
+    settings_instance_2.validate_database.return_value = None
+
+    # First call should return instance_1; any further constructor calls
+    # would return instance_2 (but they shouldn't happen).
+    mock_settings.side_effect = [settings_instance_1, settings_instance_2]
 
-    # First call should create settings
     result1 = get_settings()
-    assert result1 == "test_settings"
+    assert result1 is settings_instance_1
 
-    # Second call should use cached value
-    mock_settings.return_value = "new_settings"
+    # Even after we change what the constructor would return, the cached
+    # object must still be served.
     result2 = get_settings()
-    assert result2 == "test_settings"  # Should still be the first value
+    assert result2 is settings_instance_1
 
-    # Settings should only be created once
+    # The constructor should have been invoked exactly once.
     assert mock_settings.call_count == 1