codex-storage
/
nim-libp2p
mirror of https://github.com/codex-storage/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove sleepAsync from tests/testswitch (#792)

This commit is contained in:
Tanguy 2022-10-28 01:10:24 +02:00 committed by GitHub
parent dc13ff81d3
commit 4bce8f38c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/helpers.nim
View File

@ -105,8 +105,7 @@ proc bridgedConnections*: (Connection, Connection) =
return (connA, connB) return (connA, connB)
proc checkExpiringInternal(cond: proc(): bool {.raises: [Defect].} ): Future[bool] {.async, gcsafe.} = proc checkExpiringInternal(cond: proc(): bool {.raises: [Defect], gcsafe.} ): Future[bool] {.async, gcsafe.} =
{.gcsafe.}:
let start = Moment.now() let start = Moment.now()
while true: while true:
if Moment.now() > (start + chronos.seconds(5)): if Moment.now() > (start + chronos.seconds(5)):
@ -117,4 +116,4 @@ proc checkExpiringInternal(cond: proc(): bool {.raises: [Defect].} ): Future[boo
await sleepAsync(1.millis) await sleepAsync(1.millis)
template checkExpiring*(code: untyped): untyped = template checkExpiring*(code: untyped): untyped =
checkExpiringInternal(proc(): bool = code) check await checkExpiringInternal(proc(): bool = code)

2
tests/pubsub/testfloodsub.nim
View File

@ -351,7 +351,7 @@ suite "FloodSub":
check (await smallNode[0].publish("foo", smallMessage1)) > 0 check (await smallNode[0].publish("foo", smallMessage1)) > 0
check (await bigNode[0].publish("foo", smallMessage2)) > 0 check (await bigNode[0].publish("foo", smallMessage2)) > 0
check (await checkExpiring(messageReceived == 2)) == true checkExpiring: messageReceived == 2
check (await smallNode[0].publish("foo", bigMessage)) > 0 check (await smallNode[0].publish("foo", bigMessage)) > 0
check (await bigNode[0].publish("foo", bigMessage)) > 0 check (await bigNode[0].publish("foo", bigMessage)) > 0

7
tests/pubsub/testgossipsub.nim
View File

@ -316,11 +316,10 @@ suite "GossipSub":
let gossip1 = GossipSub(nodes[0]) let gossip1 = GossipSub(nodes[0])
let gossip2 = GossipSub(nodes[1]) let gossip2 = GossipSub(nodes[1])
check await checkExpiring( checkExpiring:
"foobar" in gossip2.topics and "foobar" in gossip2.topics and
"foobar" in gossip1.gossipsub and "foobar" in gossip1.gossipsub and
gossip1.gossipsub.hasPeerId("foobar", gossip2.peerInfo.peerId) gossip1.gossipsub.hasPeerId("foobar", gossip2.peerInfo.peerId)
)
await allFuturesThrowing( await allFuturesThrowing(
nodes[0].switch.stop(), nodes[0].switch.stop(),
@ -463,7 +462,7 @@ suite "GossipSub":
nodes[0].unsubscribe("foobar", handler) nodes[0].unsubscribe("foobar", handler)
let gsNode = GossipSub(nodes[1]) let gsNode = GossipSub(nodes[1])
check await checkExpiring(gsNode.mesh.getOrDefault("foobar").len == 0) checkExpiring: gsNode.mesh.getOrDefault("foobar").len == 0
nodes[0].subscribe("foobar", handler) nodes[0].subscribe("foobar", handler)
@ -582,7 +581,7 @@ suite "GossipSub":
gossip1.seen = TimedCache[MessageId].init() gossip1.seen = TimedCache[MessageId].init()
gossip3.seen = TimedCache[MessageId].init() gossip3.seen = TimedCache[MessageId].init()
let msgId = toSeq(gossip2.validationSeen.keys)[0] let msgId = toSeq(gossip2.validationSeen.keys)[0]
check await checkExpiring(try: gossip2.validationSeen[msgId].len > 0 except: false) checkExpiring(try: gossip2.validationSeen[msgId].len > 0 except: false)
result = ValidationResult.Accept result = ValidationResult.Accept
bFinished.complete() bFinished.complete()

4
tests/testidentify.nim
View File

@ -202,8 +202,8 @@ suite "Identify":
await identifyPush2.push(switch2.peerInfo, conn) await identifyPush2.push(switch2.peerInfo, conn)
check await checkExpiring(switch1.peerStore[ProtoBook][switch2.peerInfo.peerId] == switch2.peerInfo.protocols) checkExpiring: switch1.peerStore[ProtoBook][switch2.peerInfo.peerId] == switch2.peerInfo.protocols
check await checkExpiring(switch1.peerStore[AddressBook][switch2.peerInfo.peerId] == switch2.peerInfo.addrs) checkExpiring: switch1.peerStore[AddressBook][switch2.peerInfo.peerId] == switch2.peerInfo.addrs
await closeAll() await closeAll()

8
tests/testmplex.nim
View File

@ -816,7 +816,7 @@ suite "Mplex":
for i in 0..9: for i in 0..9:
dialStreams.add((await mplexDial.newStream())) dialStreams.add((await mplexDial.newStream()))
check await checkExpiring(listenStreams.len == 10 and dialStreams.len == 10) checkExpiring: listenStreams.len == 10 and dialStreams.len == 10
await mplexListen.close() await mplexListen.close()
await allFuturesThrowing( await allFuturesThrowing(
@ -862,7 +862,7 @@ suite "Mplex":
for i in 0..9: for i in 0..9:
dialStreams.add((await mplexDial.newStream())) dialStreams.add((await mplexDial.newStream()))
check await checkExpiring(listenStreams.len == 10 and dialStreams.len == 10) checkExpiring: listenStreams.len == 10 and dialStreams.len == 10
mplexHandle.cancel() mplexHandle.cancel()
await allFuturesThrowing( await allFuturesThrowing(
@ -905,7 +905,7 @@ suite "Mplex":
for i in 0..9: for i in 0..9:
dialStreams.add((await mplexDial.newStream())) dialStreams.add((await mplexDial.newStream()))
check await checkExpiring(listenStreams.len == 10 and dialStreams.len == 10) checkExpiring: listenStreams.len == 10 and dialStreams.len == 10
await conn.close() await conn.close()
await allFuturesThrowing( await allFuturesThrowing(
@ -951,7 +951,7 @@ suite "Mplex":
for i in 0..9: for i in 0..9:
dialStreams.add((await mplexDial.newStream())) dialStreams.add((await mplexDial.newStream()))
check await checkExpiring(listenStreams.len == 10 and dialStreams.len == 10) checkExpiring: listenStreams.len == 10 and dialStreams.len == 10
await listenConn.closeWithEOF() await listenConn.closeWithEOF()
await allFuturesThrowing( await allFuturesThrowing(

59
tests/testswitch.nim
View File

@ -247,14 +247,12 @@ suite "Switch":
await switch2.disconnect(switch1.peerInfo.peerId) await switch2.disconnect(switch1.peerInfo.peerId)
check not switch2.isConnected(switch1.peerInfo.peerId) check not switch2.isConnected(switch1.peerInfo.peerId)
check await(checkExpiring((not switch1.isConnected(switch2.peerInfo.peerId)))) checkExpiring: not switch1.isConnected(switch2.peerInfo.peerId)
checkTracker(LPChannelTrackerName) checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName) checkTracker(SecureConnTrackerName)
await sleepAsync(1.seconds) checkExpiring:
check:
startCounts == startCounts ==
@[ @[
switch1.connManager.inSema.count, switch1.connManager.outSema.count, switch1.connManager.inSema.count, switch1.connManager.outSema.count,
@ -302,7 +300,7 @@ suite "Switch":
await switch2.disconnect(switch1.peerInfo.peerId) await switch2.disconnect(switch1.peerInfo.peerId)
check not switch2.isConnected(switch1.peerInfo.peerId) check not switch2.isConnected(switch1.peerInfo.peerId)
check await(checkExpiring((not switch1.isConnected(switch2.peerInfo.peerId)))) checkExpiring: not switch1.isConnected(switch2.peerInfo.peerId)
checkTracker(LPChannelTrackerName) checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName) checkTracker(SecureConnTrackerName)
@ -354,7 +352,7 @@ suite "Switch":
await switch2.disconnect(switch1.peerInfo.peerId) await switch2.disconnect(switch1.peerInfo.peerId)
check not switch2.isConnected(switch1.peerInfo.peerId) check not switch2.isConnected(switch1.peerInfo.peerId)
check await(checkExpiring((not switch1.isConnected(switch2.peerInfo.peerId)))) checkExpiring: not switch1.isConnected(switch2.peerInfo.peerId)
checkTracker(LPChannelTrackerName) checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName) checkTracker(SecureConnTrackerName)
@ -405,7 +403,7 @@ suite "Switch":
await switch2.disconnect(switch1.peerInfo.peerId) await switch2.disconnect(switch1.peerInfo.peerId)
check not switch2.isConnected(switch1.peerInfo.peerId) check not switch2.isConnected(switch1.peerInfo.peerId)
check await(checkExpiring((not switch1.isConnected(switch2.peerInfo.peerId)))) checkExpiring: not switch1.isConnected(switch2.peerInfo.peerId)
checkTracker(LPChannelTrackerName) checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName) checkTracker(SecureConnTrackerName)
@ -456,7 +454,7 @@ suite "Switch":
await switch2.disconnect(switch1.peerInfo.peerId) await switch2.disconnect(switch1.peerInfo.peerId)
check not switch2.isConnected(switch1.peerInfo.peerId) check not switch2.isConnected(switch1.peerInfo.peerId)
check await(checkExpiring((not switch1.isConnected(switch2.peerInfo.peerId)))) checkExpiring: not switch1.isConnected(switch2.peerInfo.peerId)
checkTracker(LPChannelTrackerName) checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName) checkTracker(SecureConnTrackerName)
@ -520,8 +518,8 @@ suite "Switch":
check not switch2.isConnected(switch1.peerInfo.peerId) check not switch2.isConnected(switch1.peerInfo.peerId)
check not switch3.isConnected(switch1.peerInfo.peerId) check not switch3.isConnected(switch1.peerInfo.peerId)
check await(checkExpiring((not switch1.isConnected(switch2.peerInfo.peerId)))) checkExpiring: not switch1.isConnected(switch2.peerInfo.peerId)
check await(checkExpiring((not switch1.isConnected(switch3.peerInfo.peerId)))) checkExpiring: not switch1.isConnected(switch3.peerInfo.peerId)
checkTracker(LPChannelTrackerName) checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName) checkTracker(SecureConnTrackerName)
@ -554,7 +552,6 @@ suite "Switch":
await switches[0].disconnect(peerInfo.peerId) # trigger disconnect await switches[0].disconnect(peerInfo.peerId) # trigger disconnect
of ConnEventKind.Disconnected: of ConnEventKind.Disconnected:
check not switches[0].isConnected(peerInfo.peerId) check not switches[0].isConnected(peerInfo.peerId)
await sleepAsync(1.millis)
done.complete() done.complete()
switches.add(newStandardSwitch( switches.add(newStandardSwitch(
@ -571,8 +568,6 @@ suite "Switch":
await onConnect await onConnect
await done await done
checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName)
await allFuturesThrowing( await allFuturesThrowing(
switches.mapIt( it.stop() )) switches.mapIt( it.stop() ))
@ -625,42 +620,6 @@ suite "Switch":
await allFuturesThrowing( await allFuturesThrowing(
switches.mapIt( it.stop() )) switches.mapIt( it.stop() ))
# TODO: we should be able to test cancellation
# for most of the steps in the upgrade flow -
# this is just a basic test for dials
asyncTest "e2e canceling dial should not leak":
let ma = @[MultiAddress.init("/ip4/0.0.0.0/tcp/0").tryGet()]
let transport = TcpTransport.new(upgrade = Upgrade())
await transport.start(ma)
proc acceptHandler() {.async, gcsafe.} =
try:
let conn = await transport.accept()
discard await conn.readLp(100)
await conn.close()
except CatchableError:
discard
let handlerWait = acceptHandler()
let switch = newStandardSwitch(secureManagers = [SecureProtocol.Noise])
await switch.start()
var peerId = PeerId.init(PrivateKey.random(ECDSA, rng[]).get()).get()
let connectFut = switch.connect(peerId, transport.addrs)
await sleepAsync(500.millis)
connectFut.cancel()
await handlerWait
checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName)
checkTracker(ChronosStreamTrackerName)
await allFuturesThrowing(
transport.stop(),
switch.stop())
asyncTest "e2e closing remote conn should not leak": asyncTest "e2e closing remote conn should not leak":
let ma = @[MultiAddress.init("/ip4/0.0.0.0/tcp/0").tryGet()] let ma = @[MultiAddress.init("/ip4/0.0.0.0/tcp/0").tryGet()]
@ -716,7 +675,7 @@ suite "Switch":
await allFuturesThrowing(readers) await allFuturesThrowing(readers)
await switch2.stop() #Otherwise this leaks await switch2.stop() #Otherwise this leaks
check await checkExpiring(not switch1.isConnected(switch2.peerInfo.peerId)) checkExpiring: not switch1.isConnected(switch2.peerInfo.peerId)
checkTracker(LPChannelTrackerName) checkTracker(LPChannelTrackerName)
checkTracker(SecureConnTrackerName) checkTracker(SecureConnTrackerName)