From 0b61b6233436af6c027ce0ca9549a2d2a7851e45 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 2 Apr 2025 21:38:50 -1000
Subject: [PATCH] Avoid logging a warning when replacing an ignored config
 entry (#142114)

Replacing an ignored config entry with one from the user
flow should not generate a warning. We should only warn
if we are replacing a usable config entry.

Followup to adjust the warning added in #130567
cc @epenet
---
 homeassistant/config_entries.py | 6 +++++-
 tests/test_config_entries.py    | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 81df30210e1..73393ba75d5 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -1612,7 +1612,11 @@ class ConfigEntriesFlowManager(
                 result["handler"], flow.unique_id
             )
 
-        if existing_entry is not None and flow.handler != "mobile_app":
+        if (
+            existing_entry is not None
+            and flow.handler != "mobile_app"
+            and existing_entry.source != SOURCE_IGNORE
+        ):
             # This causes the old entry to be removed and replaced, when the flow
             # should instead be aborted.
             # In case of manual flows, integrations should implement options, reauth,
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index 6147102f68f..2d9d18a067d 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -8797,15 +8797,17 @@ async def test_add_description_placeholder_automatically_not_overwrites(
 
 
 @pytest.mark.parametrize(
-    ("domain", "expected_log"),
+    ("domain", "source", "expected_log"),
     [
-        ("some_integration", True),
-        ("mobile_app", False),
+        ("some_integration", config_entries.SOURCE_USER, True),
+        ("some_integration", config_entries.SOURCE_IGNORE, False),
+        ("mobile_app", config_entries.SOURCE_USER, False),
     ],
 )
 async def test_create_entry_existing_unique_id(
     hass: HomeAssistant,
     domain: str,
+    source: str,
     expected_log: bool,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
@@ -8816,6 +8818,7 @@ async def test_create_entry_existing_unique_id(
         entry_id="01J915Q6T9F6G5V0QJX6HBC94T",
         data={"host": "any", "port": 123},
         unique_id="mock-unique-id",
+        source=source,
     )
     entry.add_to_hass(hass)