jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-25 01:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "OS latest version set from upgrade path" (#3631)

Browse Source
This commit is contained in:
Mike Degatano 2022-05-10 18:31:37 -04:00 committed by GitHub
parent 0548afdb61
commit f8ac2b202c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
supervisor/updater.py
View File

@ -243,15 +243,6 @@ class Updater(FileConfiguration, CoreSysAttributes):
self._data[ATTR_OTA] = data["ota"] self._data[ATTR_OTA] = data["ota"]
if version := data["hassos"].get(self.sys_os.board): if version := data["hassos"].get(self.sys_os.board):
events.append("os") events.append("os")
upgrade_map = data.get("hassos-upgrade", {})
if last_in_major := upgrade_map.get(str(self.sys_os.version.major)):
if self.sys_os.version != AwesomeVersion(last_in_major):
version = last_in_major
elif last_in_next_major := upgrade_map.get(
str(int(self.sys_os.version.major) + 1)
):
version = last_in_next_major
self._data[ATTR_HASSOS] = AwesomeVersion(version) self._data[ATTR_HASSOS] = AwesomeVersion(version)
else: else:
_LOGGER.warning( _LOGGER.warning(

23
tests/test_updater.py
View File

@ -1,8 +1,5 @@
"""Test updater files.""" """Test updater files."""
from unittest.mock import patch
from awesomeversion import AwesomeVersion
import pytest import pytest
from supervisor.coresys import CoreSys from supervisor.coresys import CoreSys
@ -51,23 +48,3 @@ async def test_fetch_versions(coresys: CoreSys) -> None:
assert coresys.updater.image_multicast == data["images"]["multicast"].format( assert coresys.updater.image_multicast == data["images"]["multicast"].format(
arch=coresys.arch.supervisor arch=coresys.arch.supervisor
) )
@pytest.mark.parametrize(
"version, expected",
[
("3.1", "3.13"),
("4.5", "4.20"),
("5.0", "5.13"),
("6.4", "6.6"),
("4.20", "5.13"),
],
)
async def test_os_update_path(coresys: CoreSys, version: str, expected: str):
"""Test OS upgrade path across major versions."""
coresys.os._board = "rpi4" # pylint: disable=protected-access
coresys.os._version = AwesomeVersion(version) # pylint: disable=protected-access
with patch.object(type(coresys.security), "verify_own_content"):
await coresys.updater.fetch_data()
assert coresys.updater.version_hassos == AwesomeVersion(expected)