Merge pull request #998 from puddly/puddly/load-network-info-after-form

Load network information after forming a new network
zigpy · Jun 19, 2022 · 3fa9eaf · 3fa9eaf
2 parents 01feddc + c65d3d6
commit 3fa9eaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tests/test_application.py b/tests/test_application.py
@@ -593,7 +593,9 @@ async def test_startup_formed(app):
 async def test_startup_not_formed(app):
     app.start_network = AsyncMock()
     app.form_network = AsyncMock()
-    app.load_network_info = AsyncMock(side_effect=NetworkNotFormed())
+    app.load_network_info = AsyncMock(
+        side_effect=[NetworkNotFormed(), NetworkNotFormed(), None]
+    )
     app.permit = AsyncMock()
 
     with pytest.raises(NetworkNotFormed):

diff --git a/zigpy/application.py b/zigpy/application.py
@@ -72,6 +72,7 @@ async def startup(self, *, auto_form: bool = False):
 
                 LOGGER.info("Forming a new network")
                 await self.form_network()
+                await self.load_network_info(load_devices=False)
 
             LOGGER.debug("Network info: %s", self.state.network_info)
             LOGGER.debug("Node info: %s", self.state.node_info)