WIP

tests/core/integration_test_helpers.py

@@ -182,15 +182,16 @@ async def run_peer_pool_event_server(event_bus, peer_pool, handler_type=None):
 
     handler_type = PeerPoolEventServer if handler_type is None else handler_type
 
-    peer_pool_event_bus_request_handler = handler_type(
+    event_server = handler_type(
         event_bus,
         peer_pool,
         peer_pool.cancel_token
     )
-    asyncio.ensure_future(peer_pool_event_bus_request_handler.run())
+    asyncio.ensure_future(event_server.run())
     # Give event subscriptions a moment to propagate
     await asyncio.sleep(0.01)
-    await peer_pool_event_bus_request_handler.events.started.wait()
+    await event_server.events.started.wait()
+    return event_server
 
 
 async def run_request_server(event_bus, chaindb, server_type=None):

tests/core/p2p-proto/bcc/test_requests.py

@@ -49,14 +49,15 @@ async def get_request_server_setup(request, event_loop, event_bus, chain_db):
     response_buffer = MsgBuffer()
     alice.add_subscriber(response_buffer)
 
-    await run_peer_pool_event_server(event_bus, bob_peer_pool, handler_type=BCCPeerPoolEventServer)
+    event_server = await run_peer_pool_event_server(event_bus, bob_peer_pool, handler_type=BCCPeerPoolEventServer)
 
     bob_request_server = BCCRequestServer(
         event_bus, TO_NETWORKING_BROADCAST_CONFIG, bob.context.chain_db)
     asyncio.ensure_future(bob_request_server.run())
 
     def finalizer():
         event_loop.run_until_complete(bob_request_server.cancel())
+        event_loop.run_until_complete(event_server.cancel())
 
     request.addfinalizer(finalizer)