fix(tests): make integration tests pass on macOS

tests/integration_tests/test_servercontext.py

@@ -12,6 +12,16 @@
 from tests.utils import exhaust_callbacks, fast_forward
 
 
+async def wait_for_connection_registered(ctx, max_iters=1000):
+    for _ in range(max_iters):
+        if ctx.connections:
+            return
+        await asyncio.sleep(0)
+    raise AssertionError(
+        "Server did not register the connection within the allotted iterations"
+    )
+
+
 class MockConnection:
     def __init__(self):
         self.protocol = None
@@ -91,6 +101,7 @@ async def test_connection_broken_external(context):
     """
     srv, ctx = context
     _, writer = await asyncio.open_connection(*srv.sockets[0].getsockname())
+    await wait_for_connection_registered(ctx)
     writer.close()
     # Need this sleep for test to work, otherwise closed protocol isn't detected
     await asyncio.sleep(0)
@@ -119,6 +130,7 @@ async def test_unexpected_exception(context, caplog, mocker):
 
     with caplog.at_level("TRACE"):
         _, writer = await asyncio.open_connection(*srv.sockets[0].getsockname())
+        await exhaust_callbacks()
 
     with closing(writer):
         assert "Exception in protocol" in caplog.text
@@ -144,6 +156,7 @@ async def test_unexpected_exception_in_connection_lost(context, caplog):
 async def test_drain_connections(context):
     srv, ctx = context
     _, writer = await asyncio.open_connection(*srv.sockets[0].getsockname())
+    await wait_for_connection_registered(ctx)
 
     with pytest.raises(asyncio.TimeoutError):
         await asyncio.wait_for(

tests/integration_tests/test_teammatchmaker.py

@@ -79,7 +79,15 @@ async def test_info_message(lobby_server):
         "mod": "tmm2v2"
     })
 
-    msg = await read_until_command(proto, "matchmaker_info")
+    def tmm2v2_populated(msg):
+        if msg["command"] != "matchmaker_info":
+            return False
+        return any(
+            q["queue_name"] == "tmm2v2" and q["boundary_80s"]
+            for q in msg.get("queues", [])
+        )
+
+    msg = await read_until(proto, tmm2v2_populated)
 
     assert msg["queues"]
     for queue in msg["queues"]: