Do not wait for CONNECTED state when resetting

Author: puddly

tests/test_network_state.py

@@ -12,6 +12,7 @@
 import zigpy_deconz
 import zigpy_deconz.api
 import zigpy_deconz.exception
+import zigpy_deconz.types
 import zigpy_deconz.zigbee.application as application
 
 from tests.async_mock import AsyncMock, patch
@@ -428,5 +429,7 @@ async def write_parameter(param, *args):
         for mock_call in app._api.write_parameter.mock_calls
     )
 
-    # Verify network state changes were called
-    assert len(app._change_network_state.mock_calls) == 2
+    # Verify network state changes were awaited
+    assert app._change_network_state.mock_calls == [
+        call(zigpy_deconz.api.NetworkState.OFFLINE)
+    ]

zigpy_deconz/zigbee/application.py

@@ -313,6 +313,14 @@ async def write_network_info(self, *, network_info, node_info):
         # Note: Changed network configuration parameters become only affective after
         # sending a Leave Network Request followed by a Create or Join Network Request
         await self._change_network_state(NetworkState.OFFLINE)
+
+        if (
+            network_info.pan_id == 0xFFFF
+            or network_info.channel_mask == zigpy.types.Channels(0)
+        ):
+            # Network is being reset, it will never enter the CONNECTED state
+            return
+
         await asyncio.sleep(CHANGE_NETWORK_STATE_DELAY)
         await self._change_network_state(NetworkState.CONNECTED)