Finish deduplicating homekit_controller enumeration tests (#64306)

2022-01-17 20:44:59 +00:00 · 2022-01-17 20:44:59 +00:00 · f0fdd7d650
commit f0fdd7d650
parent 05c177e3ed
27 changed files with 1091 additions and 1029 deletions
--- a/homeassistant/components/homekit_controller/connection.py
+++ b/homeassistant/components/homekit_controller/connection.py
@ -214,7 +214,11 @@ class HKDevice:

        devices = {}

-        for accessory in self.entity_map.accessories:
+        # Accessories need to be created in the correct order or setting up
+        # relationships with ATTR_VIA_DEVICE may fail.
+        for accessory in sorted(
+            self.entity_map.accessories, key=lambda accessory: accessory.aid
+        ):
            info = accessory.services.first(
                service_type=ServicesTypes.ACCESSORY_INFORMATION,
            )