Add a flush() function to the mock gossip router, and call it where required

This commit is contained in:
Bryan Boreham committed 2015-06-26 11:40:58 +01:00
1 parent 959e5f0082
commit c659e3448a
2 files changed
+19 -1

No files matched your search

+15 -1
View File
@@ -210,6 +210,9 @@ type broadcastMessage struct {
type exitMessage struct {
exitChan chan struct{}
}
type flushMessage struct {
flushChan chan struct{}
}
type TestGossipRouter struct {
gossipChans map[router.PeerName]chan interface{}
@@ -226,6 +229,14 @@ func (grouter *TestGossipRouter) GossipBroadcast(update router.GossipData) error
return nil
}
func (grouter *TestGossipRouter) flush() {
for _, gossipChan := range grouter.gossipChans {
flushChan := make(chan struct{})
gossipChan <- flushMessage{flushChan: flushChan}
<-flushChan
}
}
func (grouter *TestGossipRouter) removePeer(peer router.PeerName) {
gossipChan := grouter.gossipChans[peer]
resultChan := make(chan struct{})
@@ -251,6 +262,9 @@ func (grouter *TestGossipRouter) connect(sender router.PeerName, gossiper router
close(message.exitChan)
return
}
if message, isFlush := gossip.(flushMessage); isFlush {
close(message.flushChan)
}
if rand.Float32() > (1.0 - grouter.loss) {
continue
}
@@ -305,7 +319,7 @@ func makeNetworkOfAllocators(size int, cidr string) ([]*Allocator, TestGossipRou
}
gossipRouter.GossipBroadcast(allocs[size-1].Gossip())
time.Sleep(1000 * time.Millisecond)
gossipRouter.flush()
return allocs, gossipRouter, subnet
}