evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow nightly Mealie versions to pass (#121761)

Browse source 
* Allow invalid versions to pass

* Add log warning

* Change log message

* Add assert for log
This commit is contained in:
Andrew Jackson 2024-07-25 16:27:08 +01:00 • committed by GitHub
parent e8eb1ed35c
commit 131ce09490
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
homeassistant/components/mealie/__init__.py
View file

@ -16,7 +16,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.device_registry import DeviceEntryType
from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.typing import ConfigType
from .const import DOMAIN, MIN_REQUIRED_MEALIE_VERSION from .const import DOMAIN, LOGGER, MIN_REQUIRED_MEALIE_VERSION
from .coordinator import ( from .coordinator import (
MealieConfigEntry, MealieConfigEntry,
MealieData, MealieData,
@ -55,7 +55,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: MealieConfigEntry) -> bo
except MealieConnectionError as error: except MealieConnectionError as error:
raise ConfigEntryNotReady(error) from error raise ConfigEntryNotReady(error) from error
if not version.valid or version < MIN_REQUIRED_MEALIE_VERSION: if not version.valid:
LOGGER.warning(
"It seems like you are using the nightly version of Mealie, nightly versions could have changes that stop this integration working"
)
if version.valid and version < MIN_REQUIRED_MEALIE_VERSION:
raise ConfigEntryError( raise ConfigEntryError(
translation_domain=DOMAIN, translation_domain=DOMAIN,
translation_key="version_error", translation_key="version_error",

2
homeassistant/components/mealie/config_flow.py
View file

@ -55,7 +55,7 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
except Exception: # noqa: BLE001 except Exception: # noqa: BLE001
LOGGER.exception("Unexpected error") LOGGER.exception("Unexpected error")
return {"base": "unknown"}, None return {"base": "unknown"}, None
if not version.valid or version < MIN_REQUIRED_MEALIE_VERSION: if version.valid and version < MIN_REQUIRED_MEALIE_VERSION:
return {"base": "mealie_version"}, None return {"base": "mealie_version"}, None
return {}, info.user_id return {}, info.user_id

1
tests/components/mealie/test_config_flow.py
View file

@ -91,7 +91,6 @@ async def test_flow_errors(
("v1.0.0beta-5"), ("v1.0.0beta-5"),
("v1.0.0-RC2"), ("v1.0.0-RC2"),
("v0.1.0"), ("v0.1.0"),
("something"),
], ],
) )
async def test_flow_version_error( async def test_flow_version_error(

19
tests/components/mealie/test_init.py
View file

@ -70,7 +70,6 @@ async def test_setup_failure(
("v1.0.0beta-5"), ("v1.0.0beta-5"),
("v1.0.0-RC2"), ("v1.0.0-RC2"),
("v0.1.0"), ("v0.1.0"),
("something"),
], ],
) )
async def test_setup_too_old( async def test_setup_too_old(
@ -87,6 +86,24 @@ async def test_setup_too_old(
assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
async def test_setup_invalid(
hass: HomeAssistant,
mock_mealie_client: AsyncMock,
mock_config_entry: MockConfigEntry,
caplog: pytest.LogCaptureFixture,
) -> None:
"""Test setup of Mealie entry with too old version of Mealie."""
mock_mealie_client.get_about.return_value = About(version="nightly")
await setup_integration(hass, mock_config_entry)
assert (
"It seems like you are using the nightly version of Mealie, nightly versions could have changes that stop this integration working"
in caplog.text
)
assert mock_config_entry.state is ConfigEntryState.LOADED
async def test_load_unload_entry( async def test_load_unload_entry(
hass: HomeAssistant, hass: HomeAssistant,
mock_mealie_client: AsyncMock, mock_mealie_client: AsyncMock,