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

Mark event tests to run as callbacks (#38212)

Browse source 
* Mark event tests to run as callbacks

* revert change to same state check that is expected to run in a thread
This commit is contained in:
J. Nick Koston 2020-07-25 17:52:48 -10:00 • committed by GitHub
parent d1464211a6
commit 34d01d5e47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 62 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
tests/helpers/test_event.py
View file

@ -434,7 +434,7 @@ async def test_track_same_state_simple_trigger(hass):
hass, hass,
period, period,
callback_run_callback, callback_run_callback,
lambda _, _2, to_s: to_s.state == "on", callback(lambda _, _2, to_s: to_s.state == "on"),
entity_ids="light.Bowl", entity_ids="light.Bowl",
) )
@ -442,7 +442,10 @@ async def test_track_same_state_simple_trigger(hass):
coroutine_runs.append(1) coroutine_runs.append(1)
async_track_same_state( async_track_same_state(
hass, period, coroutine_run_callback, lambda _, _2, to_s: to_s.state == "on" hass,
period,
coroutine_run_callback,
callback(lambda _, _2, to_s: to_s.state == "on"),
) )
# Adding state to state machine # Adding state to state machine
@ -474,7 +477,7 @@ async def test_track_same_state_simple_no_trigger(hass):
hass, hass,
period, period,
callback_run_callback, callback_run_callback,
lambda _, _2, to_s: to_s.state == "on", callback(lambda _, _2, to_s: to_s.state == "on"),
entity_ids="light.Bowl", entity_ids="light.Bowl",
) )
@ -539,7 +542,7 @@ async def test_track_time_interval(hass):
utc_now = dt_util.utcnow() utc_now = dt_util.utcnow()
unsub = async_track_time_interval( unsub = async_track_time_interval(
hass, lambda x: specific_runs.append(x), timedelta(seconds=10) hass, callback(lambda x: specific_runs.append(x)), timedelta(seconds=10)
) )
async_fire_time_changed(hass, utc_now + timedelta(seconds=5)) async_fire_time_changed(hass, utc_now + timedelta(seconds=5))
@ -590,12 +593,14 @@ async def test_track_sunrise(hass, legacy_patchable_time):
# Track sunrise # Track sunrise
runs = [] runs = []
with patch("homeassistant.util.dt.utcnow", return_value=utc_now): with patch("homeassistant.util.dt.utcnow", return_value=utc_now):
unsub = async_track_sunrise(hass, lambda: runs.append(1)) unsub = async_track_sunrise(hass, callback(lambda: runs.append(1)))
offset_runs = [] offset_runs = []
offset = timedelta(minutes=30) offset = timedelta(minutes=30)
with patch("homeassistant.util.dt.utcnow", return_value=utc_now): with patch("homeassistant.util.dt.utcnow", return_value=utc_now):
unsub2 = async_track_sunrise(hass, lambda: offset_runs.append(1), offset) unsub2 = async_track_sunrise(
hass, callback(lambda: offset_runs.append(1)), offset
)
# run tests # run tests
async_fire_time_changed(hass, next_rising - offset) async_fire_time_changed(hass, next_rising - offset)
@ -648,7 +653,7 @@ async def test_track_sunrise_update_location(hass, legacy_patchable_time):
# Track sunrise # Track sunrise
runs = [] runs = []
with patch("homeassistant.util.dt.utcnow", return_value=utc_now): with patch("homeassistant.util.dt.utcnow", return_value=utc_now):
async_track_sunrise(hass, lambda: runs.append(1)) async_track_sunrise(hass, callback(lambda: runs.append(1)))
# Mimic sunrise # Mimic sunrise
async_fire_time_changed(hass, next_rising) async_fire_time_changed(hass, next_rising)
@ -711,12 +716,14 @@ async def test_track_sunset(hass, legacy_patchable_time):
# Track sunset # Track sunset
runs = [] runs = []
with patch("homeassistant.util.dt.utcnow", return_value=utc_now): with patch("homeassistant.util.dt.utcnow", return_value=utc_now):
unsub = async_track_sunset(hass, lambda: runs.append(1)) unsub = async_track_sunset(hass, callback(lambda: runs.append(1)))
offset_runs = [] offset_runs = []
offset = timedelta(minutes=30) offset = timedelta(minutes=30)
with patch("homeassistant.util.dt.utcnow", return_value=utc_now): with patch("homeassistant.util.dt.utcnow", return_value=utc_now):
unsub2 = async_track_sunset(hass, lambda: offset_runs.append(1), offset) unsub2 = async_track_sunset(
hass, callback(lambda: offset_runs.append(1)), offset
)
# Run tests # Run tests
async_fire_time_changed(hass, next_setting - offset) async_fire_time_changed(hass, next_setting - offset)
@ -750,14 +757,18 @@ async def test_async_track_time_change(hass):
now = dt_util.utcnow() now = dt_util.utcnow()
time_that_will_not_match_right_away = datetime(now.year + 1, 5, 24, 11, 59, 55) time_that_will_not_match_right_away = datetime(
now.year + 1, 5, 24, 11, 59, 55, tzinfo=dt_util.UTC
)
with patch( with patch(
"homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
): ):
unsub = async_track_time_change(hass, lambda x: wildcard_runs.append(x)) unsub = async_track_time_change(
hass, callback(lambda x: wildcard_runs.append(x))
)
unsub_utc = async_track_utc_time_change( unsub_utc = async_track_utc_time_change(
hass, lambda x: specific_runs.append(x), second=[0, 30] hass, callback(lambda x: specific_runs.append(x)), second=[0, 30]
) )
async_fire_time_changed( async_fire_time_changed(
@ -798,13 +809,15 @@ async def test_periodic_task_minute(hass):
now = dt_util.utcnow() now = dt_util.utcnow()
time_that_will_not_match_right_away = datetime(now.year + 1, 5, 24, 11, 59, 55) time_that_will_not_match_right_away = datetime(
now.year + 1, 5, 24, 11, 59, 55, tzinfo=dt_util.UTC
)
with patch( with patch(
"homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
): ):
unsub = async_track_utc_time_change( unsub = async_track_utc_time_change(
hass, lambda x: specific_runs.append(x), minute="/5", second=0 hass, callback(lambda x: specific_runs.append(x)), minute="/5", second=0
) )
async_fire_time_changed( async_fire_time_changed(
@ -840,13 +853,19 @@ async def test_periodic_task_hour(hass):
now = dt_util.utcnow() now = dt_util.utcnow()
time_that_will_not_match_right_away = datetime(now.year + 1, 5, 24, 21, 59, 55) time_that_will_not_match_right_away = datetime(
now.year + 1, 5, 24, 21, 59, 55, tzinfo=dt_util.UTC
)
with patch( with patch(
"homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
): ):
unsub = async_track_utc_time_change( unsub = async_track_utc_time_change(
hass, lambda x: specific_runs.append(x), hour="/2", minute=0, second=0 hass,
callback(lambda x: specific_runs.append(x)),
hour="/2",
minute=0,
second=0,
) )
async_fire_time_changed( async_fire_time_changed(
@ -896,7 +915,7 @@ async def test_periodic_task_wrong_input(hass):
with pytest.raises(ValueError): with pytest.raises(ValueError):
async_track_utc_time_change( async_track_utc_time_change(
hass, lambda x: specific_runs.append(x), hour="/two" hass, callback(lambda x: specific_runs.append(x)), hour="/two"
) )
async_fire_time_changed( async_fire_time_changed(
@ -912,13 +931,19 @@ async def test_periodic_task_clock_rollback(hass):
now = dt_util.utcnow() now = dt_util.utcnow()
time_that_will_not_match_right_away = datetime(now.year + 1, 5, 24, 21, 59, 55) time_that_will_not_match_right_away = datetime(
now.year + 1, 5, 24, 21, 59, 55, tzinfo=dt_util.UTC
)
with patch( with patch(
"homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
): ):
unsub = async_track_utc_time_change( unsub = async_track_utc_time_change(
hass, lambda x: specific_runs.append(x), hour="/2", minute=0, second=0 hass,
callback(lambda x: specific_runs.append(x)),
hour="/2",
minute=0,
second=0,
) )
async_fire_time_changed( async_fire_time_changed(
@ -970,13 +995,19 @@ async def test_periodic_task_duplicate_time(hass):
now = dt_util.utcnow() now = dt_util.utcnow()
time_that_will_not_match_right_away = datetime(now.year + 1, 5, 24, 21, 59, 55) time_that_will_not_match_right_away = datetime(
now.year + 1, 5, 24, 21, 59, 55, tzinfo=dt_util.UTC
)
with patch( with patch(
"homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
): ):
unsub = async_track_utc_time_change( unsub = async_track_utc_time_change(
hass, lambda x: specific_runs.append(x), hour="/2", minute=0, second=0 hass,
callback(lambda x: specific_runs.append(x)),
hour="/2",
minute=0,
second=0,
) )
async_fire_time_changed( async_fire_time_changed(
@ -1015,7 +1046,11 @@ async def test_periodic_task_entering_dst(hass):
"homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
): ):
unsub = async_track_time_change( unsub = async_track_time_change(
hass, lambda x: specific_runs.append(x), hour=2, minute=30, second=0 hass,
callback(lambda x: specific_runs.append(x)),
hour=2,
minute=30,
second=0,
) )
async_fire_time_changed( async_fire_time_changed(
@ -1061,7 +1096,11 @@ async def test_periodic_task_leaving_dst(hass):
"homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
): ):
unsub = async_track_time_change( unsub = async_track_time_change(
hass, lambda x: specific_runs.append(x), hour=2, minute=30, second=0 hass,
callback(lambda x: specific_runs.append(x)),
hour=2,
minute=30,
second=0,
) )
async_fire_time_changed( async_fire_time_changed(