Prevent double ZHA channel initialization (#36554)
* Preven double channel initialization. * Use a setter for setting ZHA device availability.
This commit is contained in:
1 parent
8ed1b1782e
commit
1bdbe90d2a
9 files changed
+30
-26
No files matched your search
@@ -42,7 +42,7 @@ async def device_switch(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_SWITCH_DEVICE,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ async def device_groupable(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_GROUPABLE_DEVICE,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -266,7 +266,7 @@ async def test_list_groupable_devices(zha_client, device_groupable):
|
||||
|
||||
# Make sure there are no groupable devices when the device is unavailable
|
||||
# Make device unavailable
|
||||
device_groupable.set_available(False)
|
||||
device_groupable.available = False
|
||||
|
||||
await zha_client.send_json({ID: 11, TYPE: "zha/devices/groupable"})
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ async def coordinator(hass, zigpy_device_mock, zha_device_joined):
|
||||
node_descriptor=b"\xf8\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ async def device_fan_1(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_GROUPABLE_DEVICE,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ async def device_fan_2(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_GROUPABLE_DEVICE2,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ async def coordinator(hass, zigpy_device_mock, zha_device_joined):
|
||||
node_descriptor=b"\xf8\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ async def device_light_1(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_GROUPABLE_DEVICE,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ async def device_light_2(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_GROUPABLE_DEVICE2,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ async def coordinator(hass, zigpy_device_mock, zha_device_joined):
|
||||
node_descriptor=b"\xf8\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ async def device_light_1(hass, zigpy_device_mock, zha_device_joined):
|
||||
nwk=0xB79D,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@ async def device_light_2(hass, zigpy_device_mock, zha_device_joined):
|
||||
nwk=0xC79E,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ async def device_light_3(hass, zigpy_device_mock, zha_device_joined):
|
||||
nwk=0xB89F,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ async def coordinator(hass, zigpy_device_mock, zha_device_joined):
|
||||
node_descriptor=b"\xf8\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ async def device_switch_1(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_GROUPABLE_DEVICE,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ async def device_switch_2(hass, zigpy_device_mock, zha_device_joined):
|
||||
ieee=IEEE_GROUPABLE_DEVICE2,
|
||||
)
|
||||
zha_device = await zha_device_joined(zigpy_device)
|
||||
zha_device.set_available(True)
|
||||
zha_device.available = True
|
||||
return zha_device
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user