Handle landing page correctly

Author: agners

supervisor/resolution/evaluations/core_version.py

@@ -2,10 +2,15 @@
 
 from datetime import datetime, timedelta
 
-from awesomeversion import AwesomeVersion, AwesomeVersionException
+from awesomeversion import (
+    AwesomeVersion,
+    AwesomeVersionException,
+    AwesomeVersionStrategy,
+)
 
 from ...const import CoreState
 from ...coresys import CoreSys
+from ...homeassistant.const import LANDINGPAGE
 from ..const import UnsupportedReason
 from .base import EvaluateBase
 
@@ -40,6 +45,10 @@ async def evaluate(self) -> bool:
         ):
             return False
 
+        # Skip evaluation for landingpage version
+        if current == LANDINGPAGE:
+            return False
+
         try:
             # Calculate if the current version was released more than 2 years ago
             # Home Assistant releases happen monthly, so approximately 24 versions per 2 years
@@ -55,7 +64,10 @@ async def evaluate(self) -> bool:
             cutoff_month = two_years_ago.month
 
             # Create a cutoff version based on the date 2 years ago
-            cutoff_version = AwesomeVersion(f"{cutoff_year}.{cutoff_month}")
+            cutoff_version = AwesomeVersion(
+                f"{cutoff_year}.{cutoff_month}",
+                ensure_strategy=AwesomeVersionStrategy.CALVER,
+            )
 
             # Compare current version with the cutoff
             return current < cutoff_version

tests/resolution/evaluation/test_evaluate_core_version.py

@@ -8,6 +8,7 @@
 
 from supervisor.const import CoreState
 from supervisor.coresys import CoreSys
+from supervisor.homeassistant.const import LANDINGPAGE
 from supervisor.homeassistant.module import HomeAssistant
 from supervisor.resolution.evaluations.core_version import EvaluateCoreVersion
 
@@ -22,6 +23,7 @@
         (f"{datetime.now().year - 2}.1", True),  # 2 years old, unsupported
         (f"{datetime.now().year - 3}.1", True),  # 3 years old, unsupported
         ("2021.6.0", True),  # Very old version, unsupported
+        ("landingpage", False),  # Landingpage version, should be supported
         (None, False),  # No current version info, check skipped
     ],
 )
@@ -96,6 +98,29 @@ async def test_core_version_invalid_format(coresys: CoreSys):
         assert evaluation.reason not in coresys.resolution.unsupported
 
 
+async def test_core_version_landingpage(coresys: CoreSys):
+    """Test evaluation with landingpage version."""
+    evaluation = EvaluateCoreVersion(coresys)
+    await coresys.core.set_state(CoreState.RUNNING)
+
+    with (
+        patch.object(
+            HomeAssistant,
+            "version",
+            new=PropertyMock(return_value=LANDINGPAGE),
+        ),
+        patch.object(
+            HomeAssistant,
+            "latest_version",
+            new=PropertyMock(return_value=AwesomeVersion("2024.12.0")),
+        ),
+    ):
+        assert evaluation.reason not in coresys.resolution.unsupported
+        await evaluation()
+        # Landingpage should never be marked as unsupported
+        assert evaluation.reason not in coresys.resolution.unsupported
+
+
 async def test_did_run(coresys: CoreSys):
     """Test that the evaluation ran as expected."""
     evaluation = EvaluateCoreVersion(coresys)