Fix some tests

homeassistant/helpers/device_registry.py

@@ -1095,6 +1095,7 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
                     ]
                     | {add_config_subentry_id}
                 }
+                config_entries_subentries[add_config_entry_id].discard(None)
 
         if (
             remove_config_entry_id is not UNDEFINED

tests/helpers/test_device_registry.py

@@ -269,7 +269,7 @@ async def test_multiple_config_subentries(
     assert entry.id == entry_id
     assert entry.config_entries == {config_entry_1.entry_id}
     assert entry.config_entries_subentries == {
-        config_entry_1.entry_id: {None, "mock-subentry-id-1-1"}
+        config_entry_1.entry_id: {"mock-subentry-id-1-1"}
     }
 
     entry = device_registry.async_get_or_create(
@@ -283,7 +283,7 @@ async def test_multiple_config_subentries(
     assert entry.id == entry_id
     assert entry.config_entries == {config_entry_1.entry_id}
     assert entry.config_entries_subentries == {
-        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"}
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"}
     }
 
     entry = device_registry.async_get_or_create(
@@ -297,7 +297,7 @@ async def test_multiple_config_subentries(
     assert entry.id == entry_id
     assert entry.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
     assert entry.config_entries_subentries == {
-        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"},
         config_entry_2.entry_id: {"mock-subentry-id-2-1"},
     }
 
@@ -1850,7 +1850,7 @@ async def test_removing_config_subentries(
     assert entry.id == entry4.id
     assert entry4.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
     assert entry4.config_entries_subentries == {
-        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"},
         config_entry_2.entry_id: {"mock-subentry-id-2-1"},
     }
 
@@ -1887,7 +1887,7 @@ async def test_removing_config_subentries(
 
     await hass.async_block_till_done()
 
-    assert len(update_events) == 8
+    assert len(update_events) == 7
     assert update_events[0].data == {
         "action": "create",
         "device_id": entry.id,
@@ -1904,7 +1904,7 @@ async def test_removing_config_subentries(
         "device_id": entry.id,
         "changes": {
             "config_entries_subentries": {
-                config_entry_1.entry_id: {None, "mock-subentry-id-1-1"}
+                config_entry_1.entry_id: {"mock-subentry-id-1-1"}
             },
         },
     }
@@ -1915,7 +1915,6 @@ async def test_removing_config_subentries(
             "config_entries": {config_entry_1.entry_id},
             "config_entries_subentries": {
                 config_entry_1.entry_id: {
-                    None,
                     "mock-subentry-id-1-1",
                     "mock-subentry-id-1-2",
                 }
@@ -1929,7 +1928,6 @@ async def test_removing_config_subentries(
         "changes": {
             "config_entries_subentries": {
                 config_entry_1.entry_id: {
-                    None,
                     "mock-subentry-id-1-1",
                     "mock-subentry-id-1-2",
                 },
@@ -1940,21 +1938,6 @@ async def test_removing_config_subentries(
         },
     }
     assert update_events[5].data == {
-        "action": "update",
-        "device_id": entry.id,
-        "changes": {
-            "config_entries_subentries": {
-                config_entry_1.entry_id: {
-                    "mock-subentry-id-1-1",
-                    "mock-subentry-id-1-2",
-                },
-                config_entry_2.entry_id: {
-                    "mock-subentry-id-2-1",
-                },
-            },
-        },
-    }
-    assert update_events[6].data == {
         "action": "update",
         "device_id": entry.id,
         "changes": {
@@ -1970,7 +1953,7 @@ async def test_removing_config_subentries(
             "primary_config_entry": config_entry_1.entry_id,
         },
     }
-    assert update_events[7].data == {
+    assert update_events[6].data == {
         "action": "remove",
         "device_id": entry.id,
     }
@@ -2052,7 +2035,7 @@ async def test_deleted_device_removing_config_subentries(
     assert entry.id == entry4.id
     assert entry4.config_entries == {config_entry_1.entry_id, config_entry_2.entry_id}
     assert entry4.config_entries_subentries == {
-        config_entry_1.entry_id: {None, "mock-subentry-id-1-1", "mock-subentry-id-1-2"},
+        config_entry_1.entry_id: {"mock-subentry-id-1-1", "mock-subentry-id-1-2"},
         config_entry_2.entry_id: {"mock-subentry-id-2-1"},
     }
 
@@ -2080,7 +2063,7 @@ async def test_deleted_device_removing_config_subentries(
         "device_id": entry.id,
         "changes": {
             "config_entries_subentries": {
-                config_entry_1.entry_id: {None, "mock-subentry-id-1-1"}
+                config_entry_1.entry_id: {"mock-subentry-id-1-1"}
             },
         },
     }
@@ -2091,7 +2074,6 @@ async def test_deleted_device_removing_config_subentries(
             "config_entries": {config_entry_1.entry_id},
             "config_entries_subentries": {
                 config_entry_1.entry_id: {
-                    None,
                     "mock-subentry-id-1-1",
                     "mock-subentry-id-1-2",
                 }
@@ -2969,12 +2951,17 @@ async def test_update_remove_config_subentries(
 
     entry = device_registry.async_get_or_create(
         config_entry_id=config_entry_1.entry_id,
-        config_subentry_id="mock-subentry-id-1-1",
         connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
         identifiers={("bridgeid", "0123")},
         manufacturer="manufacturer",
         model="model",
     )
+    assert entry.config_entries_subentries == {config_entry_1.entry_id: {None}}
+    entry = device_registry.async_update_device(
+        entry.id,
+        add_config_entry_id=config_entry_1.entry_id,
+        add_config_subentry_id="mock-subentry-id-1-1",
+    )
     entry_id = entry.id
     assert entry.config_entries == {config_entry_1.entry_id}
     assert entry.config_entries_subentries == {
@@ -3113,12 +3100,19 @@ async def test_update_remove_config_subentries(
 
     await hass.async_block_till_done()
 
-    assert len(update_events) == 8
+    assert len(update_events) == 9
     assert update_events[0].data == {
         "action": "create",
         "device_id": entry_id,
     }
     assert update_events[1].data == {
+        "action": "update",
+        "device_id": entry_id,
+        "changes": {
+            "config_entries_subentries": {config_entry_1.entry_id: {None}},
+        },
+    }
+    assert update_events[2].data == {
         "action": "update",
         "device_id": entry_id,
         "changes": {
@@ -3127,7 +3121,7 @@ async def test_update_remove_config_subentries(
             },
         },
     }
-    assert update_events[2].data == {
+    assert update_events[3].data == {
         "action": "update",
         "device_id": entry_id,
         "changes": {
@@ -3140,7 +3134,7 @@ async def test_update_remove_config_subentries(
             },
         },
     }
-    assert update_events[3].data == {
+    assert update_events[4].data == {
         "action": "update",
         "device_id": entry_id,
         "changes": {
@@ -3154,7 +3148,7 @@ async def test_update_remove_config_subentries(
             },
         },
     }
-    assert update_events[4].data == {
+    assert update_events[5].data == {
         "action": "update",
         "device_id": entry_id,
         "changes": {
@@ -3168,7 +3162,7 @@ async def test_update_remove_config_subentries(
             },
         },
     }
-    assert update_events[5].data == {
+    assert update_events[6].data == {
         "action": "update",
         "device_id": entry_id,
         "changes": {
@@ -3187,7 +3181,7 @@ async def test_update_remove_config_subentries(
             "primary_config_entry": config_entry_1.entry_id,
         },
     }
-    assert update_events[6].data == {
+    assert update_events[7].data == {
         "action": "update",
         "device_id": entry_id,
         "changes": {
@@ -3198,7 +3192,7 @@ async def test_update_remove_config_subentries(
             },
         },
     }
-    assert update_events[7].data == {
+    assert update_events[8].data == {
         "action": "remove",
         "device_id": entry_id,
     }

tests/helpers/test_entity_registry.py

@@ -1719,7 +1719,7 @@ async def test_remove_config_subentry_from_device_removes_entities(
     )
     assert device_entry.config_entries == {config_entry_1.entry_id}
     assert device_entry.config_entries_subentries == {
-        config_entry_1.entry_id: {None, "mock-subentry-id-1", "mock-subentry-id-2"},
+        config_entry_1.entry_id: {"mock-subentry-id-1", "mock-subentry-id-2"},
     }
 
     # Create one entity entry for each config entry or subentry
@@ -1749,7 +1749,6 @@ async def test_remove_config_subentry_from_device_removes_entities(
         config_subentry_id=None,
         device_id=device_entry.id,
     )
-
     assert entity_registry.async_is_registered(entry_1.entity_id)
     assert entity_registry.async_is_registered(entry_2.entity_id)
     assert entity_registry.async_is_registered(entry_3.entity_id)
@@ -1841,7 +1840,7 @@ async def test_remove_config_subentry_from_device_removes_entities_2(
     )
     assert device_entry.config_entries == {config_entry_1.entry_id}
     assert device_entry.config_entries_subentries == {
-        config_entry_1.entry_id: {None, "mock-subentry-id-1", "mock-subentry-id-2"},
+        config_entry_1.entry_id: {"mock-subentry-id-1", "mock-subentry-id-2"},
     }
 
     # Create an entity without config entry or subentry