jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-15 17:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loop in sun.sun (#89723)

Browse Source
This commit is contained in:
Penny Wood 2023-03-15 10:27:29 +08:00 committed by GitHub
parent 4ddcb14053
commit 858fc30fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/helpers/sun.py
View File

@ -82,7 +82,8 @@ def get_location_astral_event_next(
kwargs["observer_elevation"] = elevation kwargs["observer_elevation"] = elevation
mod = -1 mod = -1
while True: first_err = None
while mod < 367:
try: try:
next_dt = ( next_dt = (
cast(_AstralSunEventCallable, getattr(location, event))( cast(_AstralSunEventCallable, getattr(location, event))(
@ -94,9 +95,13 @@ def get_location_astral_event_next(
) )
if next_dt > utc_point_in_time: if next_dt > utc_point_in_time:
return next_dt return next_dt
except ValueError: except ValueError as err:
pass if not first_err:
first_err = err
mod += 1 mod += 1
raise ValueError(
f"Unable to find event after one year, initial ValueError: {first_err}"
) from first_err
@callback @callback

14
tests/helpers/test_sun.py
View File

@ -3,6 +3,8 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from unittest.mock import patch from unittest.mock import patch
import pytest
from homeassistant.const import SUN_EVENT_SUNRISE, SUN_EVENT_SUNSET from homeassistant.const import SUN_EVENT_SUNRISE, SUN_EVENT_SUNSET
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
import homeassistant.helpers.sun as sun import homeassistant.helpers.sun as sun
@ -192,3 +194,15 @@ def test_norway_in_june(hass: HomeAssistant) -> None:
) )
assert sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, june) is None assert sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, june) is None
assert sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, june) is None assert sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, june) is None
def test_impossible_elevation(hass: HomeAssistant) -> None:
"""Test altitude where the sun can't set."""
hass.config.latitude = 69.6
hass.config.longitude = 18.8
hass.config.elevation = 10000000
june = datetime(2016, 6, 1, tzinfo=dt_util.UTC)
with pytest.raises(ValueError):
sun.get_astral_event_next(hass, SUN_EVENT_SUNRISE, june)