Flakiness fix, attempt 2

Author: puddly

tests/application/test_joining.py

@@ -217,26 +217,26 @@ async def test_on_zdo_device_join_and_announce_fast(device, make_application, mo
     app, znp_server = make_application(server_cls=device)
     await app.startup(auto_form=False)
 
-    mocker.patch.object(app, "handle_join", wraps=app.handle_join)
+    app.handle_join = mock.Mock()
     mocker.patch("zigpy_znp.zigbee.application.DEVICE_JOIN_MAX_DELAY", new=0.5)
 
     nwk = 0x1234
     ieee = t.EUI64.convert("11:22:33:44:55:66:77:88")
 
     assert not app._join_announce_tasks
 
+    znp_server.reply_to(
+        c.ZDO.ExtRouteDisc.Req(partial=True),
+        responses=[c.ZDO.ExtRouteDisc.Rsp(Status=t.Status.SUCCESS)],
+    )
+
     znp_server.send(c.ZDO.TCDevInd.Callback(SrcNwk=nwk, SrcIEEE=ieee, ParentNwk=0x0001))
 
     # We're waiting for the device to announce itself
     assert app.handle_join.call_count == 0
 
     await asyncio.sleep(0.1)
 
-    znp_server.reply_to(
-        c.ZDO.ExtRouteDisc.Req(partial=True),
-        responses=[c.ZDO.ExtRouteDisc.Rsp(Status=t.Status.SUCCESS)],
-    )
-
     znp_server.send(
         c.ZDO.MsgCbIncoming.Callback(
             Src=nwk,
@@ -264,19 +264,19 @@ async def test_on_zdo_device_join_and_announce_fast(device, make_application, mo
         )
     )
 
-    await asyncio.sleep(0.1)
+    for _attempt in range(5):
+        await asyncio.sleep(0.1)
+
+        if len(app.handle_join.mock_calls) > 0:
+            break
 
     app.handle_join.assert_called_once_with(nwk=nwk, ieee=ieee, parent_nwk=None)
 
     # Everything is cleaned up
     assert not app._join_announce_tasks
 
-    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(