Refine Mplex.close and SwarmConn.close

Ensure `close` cleans up things and cancel the service finally.

tests/network/test_swarm_conn.py

@@ -1,20 +1,23 @@
 import pytest
 import trio
+from trio.testing import wait_all_tasks_blocked
 
 
 @pytest.mark.trio
 async def test_swarm_conn_close(swarm_conn_pair):
     conn_0, conn_1 = swarm_conn_pair
 
-    assert not conn_0.event_closed.is_set()
-    assert not conn_1.event_closed.is_set()
+    assert not conn_0.is_closed
+    assert not conn_1.is_closed
 
     await conn_0.close()
 
-    await trio.sleep(0.01)
+    await trio.sleep(0.1)
+    await wait_all_tasks_blocked()
+    await conn_0.manager.wait_finished()
 
-    assert conn_0.event_closed.is_set()
-    assert conn_1.event_closed.is_set()
+    assert conn_0.is_closed
+    assert conn_1.is_closed
     assert conn_0 not in conn_0.swarm.connections.values()
     assert conn_1 not in conn_1.swarm.connections.values()
 

tests/stream_muxer/test_mplex_conn.py

@@ -8,10 +8,6 @@ async def test_mplex_conn(mplex_conn_pair):
 
     assert len(conn_0.streams) == 0
     assert len(conn_1.streams) == 0
-    assert not conn_0.event_shutting_down.is_set()
-    assert not conn_1.event_shutting_down.is_set()
-    assert not conn_0.event_closed.is_set()
-    assert not conn_1.event_closed.is_set()
 
     # Test: Open a stream, and both side get 1 more stream.
     stream_0 = await conn_0.open_stream()
@@ -29,10 +25,8 @@ async def test_mplex_conn(mplex_conn_pair):
     # Sleep for a while for both side to handle `close`.
     await trio.sleep(0.01)
     # Test: Both side is closed.
-    assert conn_0.event_shutting_down.is_set()
-    assert conn_0.event_closed.is_set()
-    assert conn_1.event_shutting_down.is_set()
-    assert conn_1.event_closed.is_set()
+    assert conn_0.is_closed
+    assert conn_1.is_closed
     # Test: All streams should have been closed.
     assert stream_0.event_remote_closed.is_set()
     assert stream_0.event_reset.is_set()

tests/transport/test_tcp.py

@@ -38,8 +38,9 @@ async def test_tcp_dial(nursery):
 
     listener = transport.create_listener(handler)
     await listener.listen(LISTEN_MADDR, nursery)
-    assert len(listener.multiaddrs) == 1
-    listen_addr = listener.multiaddrs[0]
+    addrs = listener.get_addrs()
+    assert len(addrs) == 1
+    listen_addr = addrs[0]
     raw_conn = await transport.dial(listen_addr)
 
     data = b"123"