mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Fix race condition in samsungtv turn off (#51716)
- The state would flip flop if the update happened before the TV had fully shutdown
This commit is contained in:
parent
ab490bc769
commit
4722fdf465
@ -21,6 +21,7 @@ from homeassistant.components.media_player.const import (
|
|||||||
)
|
)
|
||||||
from homeassistant.config_entries import SOURCE_REAUTH
|
from homeassistant.config_entries import SOURCE_REAUTH
|
||||||
from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, STATE_OFF, STATE_ON
|
from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, STATE_OFF, STATE_ON
|
||||||
|
from homeassistant.helpers import entity_component
|
||||||
import homeassistant.helpers.config_validation as cv
|
import homeassistant.helpers.config_validation as cv
|
||||||
from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
|
from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
|
||||||
from homeassistant.helpers.script import Script
|
from homeassistant.helpers.script import Script
|
||||||
@ -50,6 +51,13 @@ SUPPORT_SAMSUNGTV = (
|
|||||||
| SUPPORT_PLAY_MEDIA
|
| SUPPORT_PLAY_MEDIA
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Since the TV will take a few seconds to go to sleep
|
||||||
|
# and actually be seen as off, we need to wait just a bit
|
||||||
|
# more than the next scan interval
|
||||||
|
SCAN_INTERVAL_PLUS_OFF_TIME = entity_component.DEFAULT_SCAN_INTERVAL + timedelta(
|
||||||
|
seconds=5
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_entry(hass, entry, async_add_entities):
|
async def async_setup_entry(hass, entry, async_add_entities):
|
||||||
"""Set up the Samsung TV from a config entry."""
|
"""Set up the Samsung TV from a config entry."""
|
||||||
@ -148,7 +156,12 @@ class SamsungTVDevice(MediaPlayerEntity):
|
|||||||
"""Return the availability of the device."""
|
"""Return the availability of the device."""
|
||||||
if self._auth_failed:
|
if self._auth_failed:
|
||||||
return False
|
return False
|
||||||
return self._state == STATE_ON or self._on_script or self._mac
|
return (
|
||||||
|
self._state == STATE_ON
|
||||||
|
or self._on_script
|
||||||
|
or self._mac
|
||||||
|
or self._power_off_in_progress()
|
||||||
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def device_info(self):
|
def device_info(self):
|
||||||
@ -187,7 +200,7 @@ class SamsungTVDevice(MediaPlayerEntity):
|
|||||||
|
|
||||||
def turn_off(self):
|
def turn_off(self):
|
||||||
"""Turn off media player."""
|
"""Turn off media player."""
|
||||||
self._end_of_power_off = dt_util.utcnow() + timedelta(seconds=15)
|
self._end_of_power_off = dt_util.utcnow() + SCAN_INTERVAL_PLUS_OFF_TIME
|
||||||
|
|
||||||
self.send_key("KEY_POWEROFF")
|
self.send_key("KEY_POWEROFF")
|
||||||
# Force closing of remote session to provide instant UI feedback
|
# Force closing of remote session to provide instant UI feedback
|
||||||
|
@ -419,6 +419,18 @@ async def test_state_without_turnon(hass, remote):
|
|||||||
assert await hass.services.async_call(
|
assert await hass.services.async_call(
|
||||||
DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID_NOTURNON}, True
|
DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID_NOTURNON}, True
|
||||||
)
|
)
|
||||||
|
state = hass.states.get(ENTITY_ID_NOTURNON)
|
||||||
|
# Should be STATE_UNAVAILABLE after the timer expires
|
||||||
|
assert state.state == STATE_OFF
|
||||||
|
|
||||||
|
next_update = dt_util.utcnow() + timedelta(seconds=20)
|
||||||
|
with patch(
|
||||||
|
"homeassistant.components.samsungtv.bridge.Remote",
|
||||||
|
side_effect=OSError,
|
||||||
|
), patch("homeassistant.util.dt.utcnow", return_value=next_update):
|
||||||
|
async_fire_time_changed(hass, next_update)
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
|
||||||
state = hass.states.get(ENTITY_ID_NOTURNON)
|
state = hass.states.get(ENTITY_ID_NOTURNON)
|
||||||
# Should be STATE_UNAVAILABLE since there is no way to turn it back on
|
# Should be STATE_UNAVAILABLE since there is no way to turn it back on
|
||||||
assert state.state == STATE_UNAVAILABLE
|
assert state.state == STATE_UNAVAILABLE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user