status-im/nim-libp2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-libp2p.git synced 2025-02-27 12:00:44 +00:00
Code Issues Projects Releases Wiki Activity

fixup tests

Browse Source
This commit is contained in:
Dmitriy Ryajov 2020-04-17 17:16:59 -06:00
parent 03bd04544e
commit f4fe3ec561
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/testtransport.nim
View File

@ -1,10 +1,7 @@
import unittest import unittest
import chronos import chronos
import streams/stream, import transports/[transport, tcptransport],
streams/asynciters, streams/[stream, connection, utils],
streams/connection,
transports/transport,
transports/tcptransport,
multiaddress, multiaddress,
wire wire
@ -17,7 +14,7 @@ const
suite "TCP transport": suite "TCP transport":
test "test listener handle write": test "test listener handle write":
proc test(): Future[bool] {.async.} = proc test() {.async.} =
let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0") let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0")
let finished = Future[void]() let finished = Future[void]()
proc connHandler(conn: Connection) {.async, gcsafe.} = proc connHandler(conn: Connection) {.async, gcsafe.} =
@ -39,13 +36,13 @@ suite "TCP transport":
await streamTransport.closeWait() await streamTransport.closeWait()
await transportFut await transportFut
result = msg == TestBytes
check: check:
waitFor(test()) == true msg == TestBytes
waitFor(test())
test "test listener handle read": test "test listener handle read":
proc testListener(): Future[bool] {.async.} = proc test() {.async.} =
let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0") let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0")
var finished = newFuture[void]() var finished = newFuture[void]()
proc connHandler(conn: Connection): Future[void] {.async, gcsafe.} = proc connHandler(conn: Connection): Future[void] {.async, gcsafe.} =
@ -61,18 +58,18 @@ suite "TCP transport":
let transportFut = await transport.listen(ma, connHandler) let transportFut = await transport.listen(ma, connHandler)
let streamTransport = await connect(transport.ma) let streamTransport = await connect(transport.ma)
let sent = await streamTransport.write(TestBytes, TestBytes.len) let sent = await streamTransport.write(TestBytes, TestBytes.len)
result = sent == 6
check: sent == 6
await finished await finished
await transport.close() await transport.close()
await streamTransport.closeWait() await streamTransport.closeWait()
await transportFut await transportFut
check: waitFor(test())
waitFor(testListener()) == true
test "test dialer handle write": test "test dialer handle write":
proc testDialer(address: TransportAddress): Future[bool] {.async.} = proc test(address: TransportAddress) {.async.} =
let finished = newFuture[void]() let finished = newFuture[void]()
proc serveClient(server: StreamServer, proc serveClient(server: StreamServer,
transp: StreamTransport) {.async, gcsafe.} = transp: StreamTransport) {.async, gcsafe.} =
@ -98,7 +95,7 @@ suite "TCP transport":
msg = await item msg = await item
if msg.len > 0: break if msg.len > 0: break
result = msg == TestBytes check: msg == TestBytes
await finished await finished
await conn.close() await conn.close()
@ -106,11 +103,10 @@ suite "TCP transport":
server.close() server.close()
await server.join() await server.join()
check: waitFor(test(initTAddress("0.0.0.0:0")))
waitFor(testDialer(initTAddress("0.0.0.0:0"))) == true
test "test dialer handle write": test "test dialer handle write":
proc testDialer(address: TransportAddress): Future[bool] {.async, gcsafe.} = proc test(address: TransportAddress) {.async, gcsafe.} =
let finished = Future[void]() let finished = Future[void]()
proc serveClient(server: StreamServer, proc serveClient(server: StreamServer,
@ -143,13 +139,11 @@ suite "TCP transport":
server.stop() server.stop()
server.close() server.close()
await server.join() await server.join()
result = true
check: waitFor(test(initTAddress("0.0.0.0:0")))
waitFor(testDialer(initTAddress("0.0.0.0:0"))) == true
test "e2e handle write": test "e2e handle write":
proc testListenerDialer(): Future[bool] {.async.} = proc test() {.async.} =
let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0") let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0")
let finished = newFuture[void]() let finished = newFuture[void]()
@ -168,18 +162,18 @@ suite "TCP transport":
let transport2: TcpTransport = newTransport(TcpTransport) let transport2: TcpTransport = newTransport(TcpTransport)
let conn = await transport2.dial(transport1.ma) let conn = await transport2.dial(transport1.ma)
let msg = await conn.source()() let msg = await conn.source()()
result = msg == TestBytes
check: msg == TestBytes
await finished await finished
await transport1.close() await transport1.close()
await transport2.close() await transport2.close()
await transportFut await transportFut
check: waitFor(test())
waitFor(testListenerDialer()) == true
test "e2e handle read": test "e2e handle read":
proc testListenerDialer(): Future[bool] {.async.} = proc test() {.async.} =
let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0") let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0")
let finished = newFuture[void]() let finished = newFuture[void]()
@ -204,7 +198,4 @@ suite "TCP transport":
await transport1.close() await transport1.close()
await transportFut await transportFut
result = true waitFor(test())
check:
waitFor(testListenerDialer()) == true