AaronFiore/electrum
1
0
Fork 0
Code Activity

tests: made TestLNTransport.test_loop more robust

Browse Source
This commit is contained in:
SomberNight
2020-03-04 17:57:40 +01:00
parent 7962e17df6
commit dae842e2ad
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/lnworker.py
View File

@@ -169,7 +169,8 @@ class LNWorker(Logger):
self.peers[node_id] = peer self.peers[node_id] = peer
await self.taskgroup.spawn(peer.main_loop()) await self.taskgroup.spawn(peer.main_loop())
try: try:
await asyncio.start_server(cb, addr, int(port)) # FIXME: server.close(), server.wait_closed(), etc... ?
server = await asyncio.start_server(cb, addr, int(port))
except OSError as e: except OSError as e:
self.logger.error(f"cannot listen for lightning p2p. error: {e!r}") self.logger.error(f"cannot listen for lightning p2p. error: {e!r}")

11
electrum/tests/test_lntransport.py
View File

@@ -51,6 +51,7 @@ class TestLNTransport(ElectrumTestCase):
responder_shaked.set() responder_shaked.set()
server_future = asyncio.ensure_future(asyncio.start_server(cb, '127.0.0.1', 42898)) server_future = asyncio.ensure_future(asyncio.start_server(cb, '127.0.0.1', 42898))
loop.run_until_complete(server_future) loop.run_until_complete(server_future)
server = server_future.result() # type: asyncio.Server
async def connect(): async def connect():
peer_addr = LNPeerAddr('127.0.0.1', 42898, responder_key.get_public_key_bytes()) peer_addr = LNPeerAddr('127.0.0.1', 42898, responder_key.get_public_key_bytes())
t = LNTransport(initiator_key.get_secret_bytes(), peer_addr) t = LNTransport(initiator_key.get_secret_bytes(), peer_addr)
@@ -59,6 +60,10 @@ class TestLNTransport(ElectrumTestCase):
self.assertEqual(await t.read_messages().__anext__(), b'hello from server') self.assertEqual(await t.read_messages().__anext__(), b'hello from server')
server_shaked.set() server_shaked.set()
connect_future = asyncio.ensure_future(connect()) try:
loop.run_until_complete(responder_shaked.wait()) connect_future = asyncio.ensure_future(connect())
loop.run_until_complete(server_shaked.wait()) loop.run_until_complete(responder_shaked.wait())
loop.run_until_complete(server_shaked.wait())
finally:
server.close()
loop.run_until_complete(server.wait_closed())