Fix test flakiness, attempt 3

Author: puddly

tests/application/test_joining.py

@@ -205,6 +205,8 @@ async def test_on_zdo_device_join(device, make_application, mocker):
 
     app.handle_join.assert_called_once_with(nwk=nwk, ieee=ieee, parent_nwk=0x0001)
 
+    app.get_device(nwk=0x1234).cancel_initialization()
+
     await app.shutdown()
 
 
@@ -269,9 +271,6 @@ async def test_on_zdo_device_join_and_announce_fast(device, make_application, mo
     app.get_device(ieee=ieee).cancel_initialization()
     await app.shutdown()
 
-    with pytest.raises(asyncio.CancelledError):
-        await app.get_device(ieee=ieee)._initialize_task
-
 
 @mock.patch("zigpy_znp.zigbee.application.DEVICE_JOIN_MAX_DELAY", new=0.1)
 @mock.patch(

zigpy_znp/zigbee/application.py

@@ -490,7 +490,7 @@ def on_zdo_tc_device_join(self, msg: c.ZDO.TCDevInd.Callback) -> None:
 
         # Perform route discovery (just in case) when a device joins the network so that
         # we can begin initialization as soon as possible.
-        asyncio.create_task(self._discover_route(msg.SrcNwk))
+        self.create_task(self._discover_route(msg.SrcNwk))
 
         if msg.SrcIEEE in self._join_announce_tasks:
             self._join_announce_tasks.pop(msg.SrcIEEE).cancel()