From 696efe349e5ec8a4cd5ac3ba01daac2540d910ea Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Thu, 31 Oct 2024 15:10:27 +0100
Subject: [PATCH] Log type as well as value for unique_id checks (#129575)

---
 homeassistant/config_entries.py | 3 ++-
 tests/test_config_entries.py    | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index ebd460d3cdb..e99c730145e 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -1638,11 +1638,12 @@ class ConfigEntryItems(UserDict[str, ConfigEntry]):
             _LOGGER.error(
                 (
                     "Config entry '%s' from integration %s has an invalid unique_id"
-                    " '%s', please %s"
+                    " '%s' of type %s when a string is expected, please %s"
                 ),
                 entry.title,
                 entry.domain,
                 entry.unique_id,
+                type(entry.unique_id).__name__,
                 report_issue,
             )
         else:
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index cc762f8c1de..e0135657c2b 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -5447,16 +5447,17 @@ async def test_string_unique_id_no_warning(
 
 
 @pytest.mark.parametrize(
-    "unique_id",
+    ("unique_id", "type_name"),
     [
-        (123),
-        (2.3),
+        (123, "int"),
+        (2.3, "float"),
     ],
 )
 async def test_hashable_unique_id(
     hass: HomeAssistant,
     caplog: pytest.LogCaptureFixture,
     unique_id: Any,
+    type_name: str,
 ) -> None:
     """Test the ConfigEntryItems user dict handles hashable non string unique_id."""
     entries = config_entries.ConfigEntryItems(hass)
@@ -5477,6 +5478,7 @@ async def test_hashable_unique_id(
 
     assert (
         "Config entry 'title' from integration test has an invalid unique_id"
+        f" '{unique_id}' of type {type_name} when a string is expected"
     ) in caplog.text
 
     assert entry.entry_id in entries