From 854cae7f12997fe9aa596976b32bbd1d1accd93b Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Wed, 2 Apr 2025 22:39:35 +0200
Subject: [PATCH] Avoid unnecessary reload in apple_tv reauth flow (#142079)

---
 homeassistant/components/apple_tv/config_flow.py |  5 ++++-
 tests/components/apple_tv/test_config_flow.py    | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/apple_tv/config_flow.py b/homeassistant/components/apple_tv/config_flow.py
index 76c4681a30d..b026da33231 100644
--- a/homeassistant/components/apple_tv/config_flow.py
+++ b/homeassistant/components/apple_tv/config_flow.py
@@ -20,6 +20,7 @@ import voluptuous as vol
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import (
     SOURCE_IGNORE,
+    SOURCE_REAUTH,
     SOURCE_ZEROCONF,
     ConfigEntry,
     ConfigFlow,
@@ -381,7 +382,9 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
                         CONF_IDENTIFIERS: list(combined_identifiers),
                     },
                 )
-                if entry.source != SOURCE_IGNORE:
+                # Don't reload ignored entries or in the middle of reauth,
+                # e.g. if the user is entering a new PIN
+                if entry.source != SOURCE_IGNORE and self.source != SOURCE_REAUTH:
                     self.hass.config_entries.async_schedule_reload(entry.entry_id)
             if not allow_exist:
                 raise DeviceAlreadyConfigured
diff --git a/tests/components/apple_tv/test_config_flow.py b/tests/components/apple_tv/test_config_flow.py
index a13eb3c605b..c9d698e068b 100644
--- a/tests/components/apple_tv/test_config_flow.py
+++ b/tests/components/apple_tv/test_config_flow.py
@@ -59,12 +59,12 @@ def use_mocked_zeroconf(mock_async_zeroconf: MagicMock) -> None:
 
 
 @pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[None]:
+def mock_setup_entry() -> Generator[Mock]:
     """Mock setting up a config entry."""
     with patch(
         "homeassistant.components.apple_tv.async_setup_entry", return_value=True
-    ):
-        yield
+    ) as setup_entry:
+        yield setup_entry
 
 
 # User Flows
@@ -1183,7 +1183,9 @@ async def test_zeroconf_mismatch(hass: HomeAssistant, mock_scan: AsyncMock) -> N
 
 
 @pytest.mark.usefixtures("mrp_device", "pairing")
-async def test_reconfigure_update_credentials(hass: HomeAssistant) -> None:
+async def test_reconfigure_update_credentials(
+    hass: HomeAssistant, mock_setup_entry: Mock
+) -> None:
     """Test that reconfigure flow updates config entry."""
     config_entry = MockConfigEntry(
         domain="apple_tv", unique_id="mrpid", data={"identifiers": ["mrpid"]}
@@ -1215,6 +1217,9 @@ async def test_reconfigure_update_credentials(hass: HomeAssistant) -> None:
         "identifiers": ["mrpid"],
     }
 
+    await hass.async_block_till_done()
+    assert len(mock_setup_entry.mock_calls) == 1
+
 
 # Options