From de700e7859eb2251c6a90f128aef5278d3be38a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20St=C3=A5hl?= <pierre.staahl@gmail.com>
Date: Thu, 30 Jun 2022 18:59:46 +0200
Subject: [PATCH] Make media_player.toggle turn on a standby device (#74221)

---
 homeassistant/components/media_player/__init__.py |  3 ++-
 .../components/media_player/test_async_helpers.py | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index dc2f3624a0e..14546a36ec8 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -52,6 +52,7 @@ from homeassistant.const import (
     STATE_IDLE,
     STATE_OFF,
     STATE_PLAYING,
+    STATE_STANDBY,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -888,7 +889,7 @@ class MediaPlayerEntity(Entity):
             await self.hass.async_add_executor_job(self.toggle)
             return
 
-        if self.state in (STATE_OFF, STATE_IDLE):
+        if self.state in (STATE_OFF, STATE_IDLE, STATE_STANDBY):
             await self.async_turn_on()
         else:
             await self.async_turn_off()
diff --git a/tests/components/media_player/test_async_helpers.py b/tests/components/media_player/test_async_helpers.py
index 53c80bfc8de..8be263e7ee0 100644
--- a/tests/components/media_player/test_async_helpers.py
+++ b/tests/components/media_player/test_async_helpers.py
@@ -8,6 +8,7 @@ from homeassistant.const import (
     STATE_ON,
     STATE_PAUSED,
     STATE_PLAYING,
+    STATE_STANDBY,
 )
 
 
@@ -79,9 +80,13 @@ class ExtendedMediaPlayer(mp.MediaPlayerEntity):
         """Turn off state."""
         self._state = STATE_OFF
 
+    def standby(self):
+        """Put device in standby."""
+        self._state = STATE_STANDBY
+
     def toggle(self):
         """Toggle the power on the media player."""
-        if self._state in [STATE_OFF, STATE_IDLE]:
+        if self._state in [STATE_OFF, STATE_IDLE, STATE_STANDBY]:
             self._state = STATE_ON
         else:
             self._state = STATE_OFF
@@ -138,6 +143,10 @@ class SimpleMediaPlayer(mp.MediaPlayerEntity):
         """Turn off state."""
         self._state = STATE_OFF
 
+    def standby(self):
+        """Put device in standby."""
+        self._state = STATE_STANDBY
+
 
 @pytest.fixture(params=[ExtendedMediaPlayer, SimpleMediaPlayer])
 def player(hass, request):
@@ -188,3 +197,7 @@ async def test_toggle(player):
     assert player.state == STATE_ON
     await player.async_toggle()
     assert player.state == STATE_OFF
+    player.standby()
+    assert player.state == STATE_STANDBY
+    await player.async_toggle()
+    assert player.state == STATE_ON