Merge pull request #440 from plugwise/device_list_fixture

bouwew · web-flow · commit d74958dda53e · 2023-10-30T12:23:24.000+01:00
Correct device_list creation, add result to fixture
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.34.4
+
+- Bugfix: avoid device_list growing at every full-update, add device_list to fixtures
+
 ## v0.34.3
 
 - Anna+Elga now always has `cooling_present` set to `True`: the Elga (always) has cooling-capability.
diff --git a/fixtures/adam_heatpump_cooling/device_list.json b/fixtures/adam_heatpump_cooling/device_list.json
@@ -0,0 +1,24 @@
+[
+  "7d97fc3117784cfdafe347bcedcbbbcb",
+  "0ca13e8176204ca7bf6f09de59f81c83",
+  "1053c8bbf8be43c6921742b146a625f1",
+  "a03b6e8e76dd4646af1a77c31dd9370c",
+  "bbcffa48019f4b09b8368bbaf9559e68",
+  "f04c985c11ad4848b8fcd710343f9dcf",
+  "2e0fc4db2a6d4cbeb7cf786143543961",
+  "3f0afa71f16c45ab964050002560e43c",
+  "ca79d23ae0094120b877558734cff85c",
+  "838c2f48195242709b87217cf8d8a71f",
+  "c4ed311d54e341f58b4cdd201d1fde7e",
+  "eac5db95d97241f6b17790897847ccf5",
+  "beb32da072274e698146db8b022f3c36",
+  "96714ad90fc948bcbcb5021c4b9f5ae9",
+  "3b4d2574e2c9443a832b48d19a1c4f06",
+  "5ead63c65e5f44e7870ba2bd680ceb9e",
+  "1a27dd03b5454c4e8b9e75c8d1afc7af",
+  "8a482fa9dddb43acb765d019d8c9838b",
+  "ea8372c0e3ad4622ad45a041d02425f5",
+  "d3a276aeb3114a509bab1e4bf8c40348",
+  "47e2c550a33846b680725aa3fb229473",
+  "7fda9f84f01342f8afe9ebbbbff30c0f"
+]
diff --git a/fixtures/adam_jip/device_list.json b/fixtures/adam_jip/device_list.json
@@ -0,0 +1,13 @@
+[
+  "b5c2386c6f6342669e50fe49dd05b188",
+  "e4684553153b44afbef2200885f379dc",
+  "a6abc6a129ee499c88a4d420cc413b47",
+  "1346fbd8498d4dbcab7e18d51b771f3d",
+  "833de10f269c4deab58fb9df69901b4e",
+  "6f3e9d7084214c21b9dfa46f6eeb8700",
+  "f61f1a2535f54f52ad006a3d18e459ca",
+  "d4496250d0e942cfa7aea3476e9070d5",
+  "356b65335e274d769c338223e7af9c33",
+  "1da4d325838e4ad8aac12177214505c9",
+  "457ce8414de24596a2d5e7dbc9c7682f"
+]
diff --git a/fixtures/adam_multiple_devices_per_zone/device_list.json b/fixtures/adam_multiple_devices_per_zone/device_list.json
@@ -0,0 +1,20 @@
+[
+  "fe799307f1624099878210aa0b9f1475",
+  "90986d591dcd426cae3ec3e8111ff730",
+  "df4a4a8169904cdb9c03d61a21f42140",
+  "b310b72a0e354bfab43089919b9a88bf",
+  "a2c3583e0a6349358998b760cea82d2a",
+  "b59bcebaf94b499ea7d46e4a66fb62d8",
+  "d3da73bde12a47d5a6b8f9dad971f2ec",
+  "21f2b542c49845e6bb416884c55778d6",
+  "78d1126fc4c743db81b61c20e88342a7",
+  "cd0ddb54ef694e11ac18ed1cbce5dbbd",
+  "4a810418d5394b3f82727340b91ba740",
+  "02cf28bfec924855854c544690a609ef",
+  "a28f588dc4a049a483fd03a30361ad3a",
+  "6a3bf693d05e48e0b460c815a4fdd09d",
+  "680423ff840043738f42cc7f1ff97a36",
+  "f1fee6043d3642a9b0a65297455f008e",
+  "675416a629f343c495449970e2ca37b5",
+  "e7693eb9582644e5b865dba8d4447cf1"
+]
diff --git a/fixtures/adam_onoff_cooling_fake_firmware/device_list.json b/fixtures/adam_onoff_cooling_fake_firmware/device_list.json
@@ -0,0 +1,5 @@
+[
+  "7d97fc3117784cfdafe347bcedcbbbcb",
+  "0ca13e8176204ca7bf6f09de59f81c83",
+  "ca79d23ae0094120b877558734cff85c"
+]
diff --git a/fixtures/adam_plus_anna/device_list.json b/fixtures/adam_plus_anna/device_list.json
@@ -0,0 +1,7 @@
+[
+  "b128b4bbbd1f47e9bf4d756e8fb5ee94",
+  "2743216f626f43948deec1f7ab3b3d70",
+  "aa6b0002df0a46e1b1eb94beb61eddfe",
+  "ee62cad889f94e8ca3d09021f03a660b",
+  "f2be121e4a9345ac83c6e99ed89a98be"
+]
diff --git a/fixtures/adam_plus_anna_copy_with_error_domain_added/device_list.json b/fixtures/adam_plus_anna_copy_with_error_domain_added/device_list.json
@@ -0,0 +1,7 @@
+[
+  "b128b4bbbd1f47e9bf4d756e8fb5ee94",
+  "2743216f626f43948deec1f7ab3b3d70",
+  "aa6b0002df0a46e1b1eb94beb61eddfe",
+  "ee62cad889f94e8ca3d09021f03a660b",
+  "f2be121e4a9345ac83c6e99ed89a98be"
+]
diff --git a/fixtures/adam_plus_anna_new/device_list.json b/fixtures/adam_plus_anna_new/device_list.json
@@ -0,0 +1,12 @@
+[
+  "da224107914542988a88561b4452b0f6",
+  "056ee145a816487eaa69243c3280f8bf",
+  "67d73d0bd469422db25a618a5fb8eeb0",
+  "ad4838d7d35c4d6ea796ee12ae5aedf8",
+  "29542b2b6a6a4169acecc15c72a599b8",
+  "2568cc4b9c1e401495d4741a5f89bee1",
+  "854f8a9b0e7e425db97f1f110e1ce4b3",
+  "1772a4ea304041adb83f357b751341ff",
+  "e2f4322d57924fa090fbbc48b3a140dc",
+  "e8ef2a01ed3b4139a53bf749204fe6b4"
+]
diff --git a/fixtures/adam_zone_per_device/device_list.json b/fixtures/adam_zone_per_device/device_list.json
@@ -0,0 +1,20 @@
+[
+  "fe799307f1624099878210aa0b9f1475",
+  "90986d591dcd426cae3ec3e8111ff730",
+  "df4a4a8169904cdb9c03d61a21f42140",
+  "b310b72a0e354bfab43089919b9a88bf",
+  "a2c3583e0a6349358998b760cea82d2a",
+  "b59bcebaf94b499ea7d46e4a66fb62d8",
+  "d3da73bde12a47d5a6b8f9dad971f2ec",
+  "21f2b542c49845e6bb416884c55778d6",
+  "78d1126fc4c743db81b61c20e88342a7",
+  "cd0ddb54ef694e11ac18ed1cbce5dbbd",
+  "4a810418d5394b3f82727340b91ba740",
+  "02cf28bfec924855854c544690a609ef",
+  "a28f588dc4a049a483fd03a30361ad3a",
+  "6a3bf693d05e48e0b460c815a4fdd09d",
+  "680423ff840043738f42cc7f1ff97a36",
+  "f1fee6043d3642a9b0a65297455f008e",
+  "675416a629f343c495449970e2ca37b5",
+  "e7693eb9582644e5b865dba8d4447cf1"
+]
diff --git a/fixtures/anna_elga_2/device_list.json b/fixtures/anna_elga_2/device_list.json
@@ -0,0 +1,5 @@
+[
+  "fb49af122f6e4b0f91267e1cf7666d6f",
+  "573c152e7d4f4720878222bd75638f5b",
+  "ebd90df1ab334565b5895f37590ccff4"
+]
diff --git a/fixtures/anna_elga_2_cooling/device_list.json b/fixtures/anna_elga_2_cooling/device_list.json
@@ -0,0 +1,5 @@
+[
+  "fb49af122f6e4b0f91267e1cf7666d6f",
+  "573c152e7d4f4720878222bd75638f5b",
+  "ebd90df1ab334565b5895f37590ccff4"
+]
diff --git a/fixtures/anna_elga_2_schedule_off/device_list.json b/fixtures/anna_elga_2_schedule_off/device_list.json
@@ -0,0 +1,5 @@
+[
+  "fb49af122f6e4b0f91267e1cf7666d6f",
+  "573c152e7d4f4720878222bd75638f5b",
+  "ebd90df1ab334565b5895f37590ccff4"
+]
diff --git a/fixtures/anna_heatpump_cooling/device_list.json b/fixtures/anna_heatpump_cooling/device_list.json
@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]
diff --git a/fixtures/anna_heatpump_cooling_fake_firmware/device_list.json b/fixtures/anna_heatpump_cooling_fake_firmware/device_list.json
@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]
diff --git a/fixtures/anna_heatpump_heating/device_list.json b/fixtures/anna_heatpump_heating/device_list.json
@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]
diff --git a/fixtures/anna_loria_cooling_active/device_list.json b/fixtures/anna_loria_cooling_active/device_list.json
@@ -0,0 +1,5 @@
+[
+  "9ff0569b4984459fb243af64c0901894",
+  "bfb5ee0a88e14e5f97bfa725a760cc49",
+  "582dfbdace4d4aeb832923ce7d1ddda0"
+]
diff --git a/fixtures/anna_loria_heating_idle/device_list.json b/fixtures/anna_loria_heating_idle/device_list.json
@@ -0,0 +1,5 @@
+[
+  "9ff0569b4984459fb243af64c0901894",
+  "bfb5ee0a88e14e5f97bfa725a760cc49",
+  "582dfbdace4d4aeb832923ce7d1ddda0"
+]
diff --git a/fixtures/anna_v4/device_list.json b/fixtures/anna_v4/device_list.json
@@ -0,0 +1,5 @@
+[
+  "0466eae8520144c78afb29628384edeb",
+  "cd0e6156b1f04d5f952349ffbe397481",
+  "01b85360fdd243d0aaad4d6ac2a5ba7e"
+]
diff --git a/fixtures/anna_v4_dhw/device_list.json b/fixtures/anna_v4_dhw/device_list.json
@@ -0,0 +1,5 @@
+[
+  "0466eae8520144c78afb29628384edeb",
+  "cd0e6156b1f04d5f952349ffbe397481",
+  "01b85360fdd243d0aaad4d6ac2a5ba7e"
+]
diff --git a/fixtures/anna_v4_no_tag/device_list.json b/fixtures/anna_v4_no_tag/device_list.json
@@ -0,0 +1,5 @@
+[
+  "0466eae8520144c78afb29628384edeb",
+  "cd0e6156b1f04d5f952349ffbe397481",
+  "01b85360fdd243d0aaad4d6ac2a5ba7e"
+]
diff --git a/fixtures/anna_without_boiler_fw3/device_list.json b/fixtures/anna_without_boiler_fw3/device_list.json
@@ -0,0 +1,5 @@
+[
+  "a270735e4ccd45239424badc0578a2b1",
+  "c46b4794d28149699eacf053deedd003",
+  "7ffbb3ab4b6c4ab2915d7510f7bf8fe9"
+]
diff --git a/fixtures/anna_without_boiler_fw4/device_list.json b/fixtures/anna_without_boiler_fw4/device_list.json
@@ -0,0 +1,5 @@
+[
+  "a270735e4ccd45239424badc0578a2b1",
+  "c46b4794d28149699eacf053deedd003",
+  "7ffbb3ab4b6c4ab2915d7510f7bf8fe9"
+]
diff --git a/fixtures/anna_without_boiler_fw42/device_list.json b/fixtures/anna_without_boiler_fw42/device_list.json
@@ -0,0 +1,5 @@
+[
+  "a270735e4ccd45239424badc0578a2b1",
+  "c46b4794d28149699eacf053deedd003",
+  "7ffbb3ab4b6c4ab2915d7510f7bf8fe9"
+]
diff --git a/fixtures/legacy_anna/device_list.json b/fixtures/legacy_anna/device_list.json
@@ -0,0 +1,5 @@
+[
+  "0000aaaa0000aaaa0000aaaa0000aa00",
+  "04e4cbfe7f4340f090f85ec3b9e6a950",
+  "0d266432d64443e283b5d708ae98b455"
+]
diff --git a/fixtures/legacy_anna_2/device_list.json b/fixtures/legacy_anna_2/device_list.json
@@ -0,0 +1,5 @@
+[
+  "be81e3f8275b4129852c4d8d550ae2eb",
+  "ea5d8a7177e541b0a4b52da815166de4",
+  "9e7377867dc24e51b8098a5ba02bd89d"
+]
diff --git a/fixtures/m_adam_cooling/device_list.json b/fixtures/m_adam_cooling/device_list.json
@@ -0,0 +1,8 @@
+[
+  "da224107914542988a88561b4452b0f6",
+  "056ee145a816487eaa69243c3280f8bf",
+  "ad4838d7d35c4d6ea796ee12ae5aedf8",
+  "1772a4ea304041adb83f357b751341ff",
+  "e2f4322d57924fa090fbbc48b3a140dc",
+  "e8ef2a01ed3b4139a53bf749204fe6b4"
+]
diff --git a/fixtures/m_adam_heating/all_data.json b/fixtures/m_adam_heating/all_data.json
@@ -1,5 +1,28 @@
 {
   "devices": {
+    "01234567890abcdefghijklmnopqrstu": {
+      "available": false,
+      "dev_class": "thermo_sensor",
+      "firmware": "2020-11-04T01:00:00+01:00",
+      "hardware": "1",
+      "location": "f871b8c4d63549319221e294e4f88074",
+      "model": "Tom/Floor",
+      "name": "Tom Badkamer",
+      "sensors": {
+        "battery": 99,
+        "temperature": 18.6,
+        "temperature_difference": 2.3,
+        "valve_position": 0.0
+      },
+      "temperature_offset": {
+        "lower_bound": -2.0,
+        "resolution": 0.1,
+        "setpoint": 0.1,
+        "upper_bound": 2.0
+      },
+      "vendor": "Plugwise",
+      "zigbee_mac_address": "ABCD012345670A01"
+    },
     "056ee145a816487eaa69243c3280f8bf": {
       "available": true,
       "binary_sensors": {
diff --git a/fixtures/m_adam_heating/device_list.json b/fixtures/m_adam_heating/device_list.json
@@ -0,0 +1,8 @@
+[
+  "da224107914542988a88561b4452b0f6",
+  "056ee145a816487eaa69243c3280f8bf",
+  "ad4838d7d35c4d6ea796ee12ae5aedf8",
+  "1772a4ea304041adb83f357b751341ff",
+  "e2f4322d57924fa090fbbc48b3a140dc",
+  "e8ef2a01ed3b4139a53bf749204fe6b4"
+]
diff --git a/fixtures/m_anna_heatpump_cooling/device_list.json b/fixtures/m_anna_heatpump_cooling/device_list.json
@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]
diff --git a/fixtures/m_anna_heatpump_idle/device_list.json b/fixtures/m_anna_heatpump_idle/device_list.json
@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]
diff --git a/fixtures/p1v3/device_list.json b/fixtures/p1v3/device_list.json
@@ -0,0 +1 @@
+["a455b61e52394b2db5081ce025a430f3", "ba4de7613517478da82dd9b6abea36af"]
diff --git a/fixtures/p1v3_full_option/device_list.json b/fixtures/p1v3_full_option/device_list.json
@@ -0,0 +1 @@
+["cd3e822288064775a7c4afcdd70bdda2", "e950c7d5e1ee407a858e2a8b5016c8b3"]
diff --git a/fixtures/p1v3solarfake/device_list.json b/fixtures/p1v3solarfake/device_list.json
@@ -0,0 +1 @@
+["a455b61e52394b2db5081ce025a430f3", "ba4de7613517478da82dd9b6abea36af"]
diff --git a/fixtures/p1v4/device_list.json b/fixtures/p1v4/device_list.json
@@ -0,0 +1 @@
+["a455b61e52394b2db5081ce025a430f3", "ba4de7613517478da82dd9b6abea36af"]
diff --git a/fixtures/p1v4_442_single/device_list.json b/fixtures/p1v4_442_single/device_list.json
@@ -0,0 +1 @@
+["a455b61e52394b2db5081ce025a430f3", "ba4de7613517478da82dd9b6abea36af"]
diff --git a/fixtures/p1v4_442_triple/device_list.json b/fixtures/p1v4_442_triple/device_list.json
@@ -0,0 +1 @@
+["03e65b16e4b247a29ae0d75a78cb492e", "b82b6b3322484f2ea4e25e0bd5f3d61f"]
diff --git a/fixtures/smile_p1_v2/device_list.json b/fixtures/smile_p1_v2/device_list.json
@@ -0,0 +1 @@
+["aaaa0000aaaa0000aaaa0000aaaa00aa", "938696c4bcdb4b8a9a595cb38ed43913"]
diff --git a/fixtures/smile_p1_v2_2/device_list.json b/fixtures/smile_p1_v2_2/device_list.json
@@ -0,0 +1 @@
+["aaaa0000aaaa0000aaaa0000aaaa00aa", "199aa40f126840f392983d171374ab0b"]
diff --git a/fixtures/stretch_v23/device_list.json b/fixtures/stretch_v23/device_list.json
@@ -0,0 +1,20 @@
+[
+  "0000aaaa0000aaaa0000aaaa0000aa00",
+  "09c8ce93d7064fa6a233c0e4c2449bfe",
+  "33a1c784a9ff4c2d8766a0212714be09",
+  "199fd4b2caa44197aaf5b3128f6464ed",
+  "713427748874454ca1eb4488d7919cf2",
+  "fd1b74f59e234a9dae4e23b2b5cf07ed",
+  "c71f1cb2100b42ca942f056dcb7eb01f",
+  "2cc9a0fe70ef4441a9e4f55dfd64b776",
+  "6518f3f72a82486c97b91e26f2e9bd1d",
+  "828f6ce1e36744689baacdd6ddb1d12c",
+  "71e3e65ffc5a41518b19460c6e8ee34f",
+  "305452ce97c243c0a7b4ab2a4ebfe6e3",
+  "bc0adbebc50d428d9444a5d805c89da9",
+  "407aa1c1099d463c9137a3a9eda787fd",
+  "2587a7fcdd7e482dab03fda256076b4b",
+  "a28e6f5afc0e4fc68498c1f03e82a052",
+  "24b2ed37c8964c73897db6340a39c129",
+  "f7b145c8492f4dd7a4de760456fdef3e"
+]
diff --git a/fixtures/stretch_v27_no_domain/device_list.json b/fixtures/stretch_v27_no_domain/device_list.json
@@ -0,0 +1,16 @@
+[
+  "0000aaaa0000aaaa0000aaaa0000aa00",
+  "8b8d14b242e24cd789743c828b9a2ea9",
+  "8e4ecdcc9094481387e0273437bb51f9",
+  "9b9bfdb3c7ad4ca5817ccaa235f1e094",
+  "4661019bbe7b4a3bbe39f345ca5b5d98",
+  "5ee135e752034ad2a3e38a407332757f",
+  "ad858f416f3e42e6a25bbd6b18178b0e",
+  "e4172142264f488a99b63c73817c9d21",
+  "0b078d5862614880bc670cabf9f54b4e",
+  "553dfa416df94802851de32913f1ebd3",
+  "d0122ac66eba47b99d8e5fbd1e2f5932",
+  "9db23f92fd114e83acce036b6cb82295",
+  "3b729c63ca41421b9e21264adfa0a4e7",
+  "7c7f0d3da801402291b057f9ec69b5b6"
+]
diff --git a/fixtures/stretch_v31/device_list.json b/fixtures/stretch_v31/device_list.json
@@ -0,0 +1,10 @@
+[
+  "0000aaaa0000aaaa0000aaaa0000aa00",
+  "5871317346d045bc9f6b987ef25ee638",
+  "e1c884e7dede431dadee09506ec4f859",
+  "aac7b735042c4832ac9ff33aae4f453b",
+  "cfe95cf3de1948c0b8955125bf754614",
+  "059e4d03c7a34d278add5c7a4a781d19",
+  "d950b314e9d8499f968e6db8d82ef78c",
+  "d03738edfcc947f7b8f4573571d90d2d"
+]
diff --git a/plugwise/__init__.py b/plugwise/__init__.py
@@ -126,6 +126,7 @@ def _all_device_data(self) -> None:
         """
         self._update_gw_devices()
         self.device_items = self._count
+        self.device_list = []
         for device in self.gw_devices:
             self.device_list.append(device)
 
diff --git a/plugwise/helper.py b/plugwise/helper.py
@@ -265,7 +265,7 @@ def __init__(self) -> None:
         self._cooling_enabled = False
 
         self.device_items: int = 0
-        self.device_list: list[str] = []
+        self.device_list: list[str]
         self.gateway_id: str
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.34.3"
+version         = "0.34.4"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"
diff --git a/scripts/manual_fixtures.py b/scripts/manual_fixtures.py
diff --git a/tests/test_smile.py b/tests/test_smile.py
