Remove Mock fallback from runtime_state and add runtime settings regression tests

This commit is contained in:
2026-04-14 10:30:25 +02:00
parent 0e84f1f60c
commit 5e4d3fcf12
3 changed files with 50 additions and 8 deletions

View File

@@ -15,11 +15,6 @@ from typing import TYPE_CHECKING, Any
from starlette.datastructures import State
try:
from unittest.mock import Mock as _Mock
except ImportError: # pragma: no cover
_Mock = None
from app.models.config import PendingRecovery
from app.models.server import ServerStatus
@@ -47,7 +42,7 @@ class RuntimeState:
server_status: ServerStatus = field(default_factory=lambda: ServerStatus(online=False))
pending_recovery: PendingRecovery | None = None
last_activation: ActivationRecord | None = None
runtime_settings: "Settings" | None = None
runtime_settings: Settings | None = None
class ApplicationState(State):
@@ -104,8 +99,6 @@ def get_app_settings(app: Any) -> Settings:
def get_effective_settings(app: Any) -> Settings:
"""Return the effective settings for the current application instance."""
runtime_settings = getattr(app.state, "runtime_settings", None)
if runtime_settings is not None and _Mock is not None and isinstance(runtime_settings, _Mock):
return get_app_settings(app)
if runtime_settings is not None:
return runtime_settings
return get_app_settings(app)