From 0b521272ae5352a0b64b86c406c6184d2cc9e0c7 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 8 Dec 2015 23:06:02 +0000 Subject: [PATCH] prevent peer duplication in tests and correct the test assertions accordingly - they make more sense now. Fixes #1766. --- mesh/gossip_test.go | 9 +++++---- mesh/mocks_test.go | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mesh/gossip_test.go b/mesh/gossip_test.go index 5f622826..e8346f6e 100644 --- a/mesh/gossip_test.go +++ b/mesh/gossip_test.go @@ -45,8 +45,8 @@ func (router *Router) AddTestChannelConnection(r *Router) { fromPeer := NewPeerFrom(router.Ourself.Peer) toPeer := NewPeerFrom(r.Ourself.Peer) - r.Peers.FetchWithDefault(fromPeer) // Has side-effect of incrementing refcount - router.Peers.FetchWithDefault(toPeer) // + r.Peers.FetchWithDefault(fromPeer) // Has side-effect of incrementing refcount + toPeer = router.Peers.FetchWithDefault(toPeer) // conn := &mockChannelConnection{RemoteConnection{router.Ourself.Peer, toPeer, "", false, true}, r} router.Ourself.handleAddConnection(conn) @@ -69,8 +69,9 @@ func (router *Router) DeleteTestChannelConnection(r *Router) { func TestGossipTopology(t *testing.T) { wt.RunWithTimeout(t, 5*time.Second, func() { - implTestGossipTopology(t) + //implTestGossipTopology(t) }) + implTestGossipTopology(t) } // Create a Peer representing the receiver router, with connections to @@ -141,7 +142,7 @@ func implTestGossipTopology(t *testing.T) { r2.DeleteTestChannelConnection(r3) sendPendingGossip(r1, r2, r3) checkTopology(t, r1, r1.tp(r2, r3), r2.tp(r1), r3.tp(r1)) - checkTopology(t, r2, r1.tp(r2, r3), r2.tp(r1)) + checkTopology(t, r2, r1.tp(r2, r3), r2.tp(r1), r3.tp(r1)) checkTopology(t, r3, r1.tp(r2, r3), r2.tp(r1), r3.tp(r1)) // Drop the connection from 1 to 3 diff --git a/mesh/mocks_test.go b/mesh/mocks_test.go index 08ae90aa..12ae0d74 100644 --- a/mesh/mocks_test.go +++ b/mesh/mocks_test.go @@ -17,7 +17,7 @@ func (peers *Peers) AddTestConnection(p *Peer) { summary := p.PeerSummary summary.Version = 0 toPeer := NewPeerFromSummary(summary) - peers.FetchWithDefault(toPeer) // Has side-effect of incrementing refcount + toPeer = peers.FetchWithDefault(toPeer) // Has side-effect of incrementing refcount conn := newMockConnection(peers.ourself.Peer, toPeer) peers.ourself.addConnection(conn) peers.ourself.connectionEstablished(conn)