LBRYFoundation/lbcd
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcd.git synced 2025-08-23 17:47:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use new connections for peers in TestOutboundPeer

Browse source 
Fixes a rare hang during peer tests due to the same connection being
used for different outbound peers. Also fixed passing a chan to
QueueMessage(..) which was not being waited on, so was not being used.
This commit is contained in:
Javed Khan 2015-11-12 23:22:58 +05:30
parent c7eaee6020
commit 0c3cf63773
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
peer/peer_test.go
View file

@ -569,7 +569,7 @@ func TestOutboundPeer(t *testing.T) {
// Test Queue Message // Test Queue Message
fakeMsg := wire.NewMsgVerAck() fakeMsg := wire.NewMsgVerAck()
p.QueueMessage(fakeMsg, nil) p.QueueMessage(fakeMsg, nil)
done := make(chan struct{}, 5) done := make(chan struct{})
p.QueueMessage(fakeMsg, done) p.QueueMessage(fakeMsg, done)
<-done <-done
p.Shutdown() p.Shutdown()
@ -584,12 +584,14 @@ func TestOutboundPeer(t *testing.T) {
return hash, 234439, nil return hash, 234439, nil
} }
peerCfg.NewestBlock = newestBlock peerCfg.NewestBlock = newestBlock
r1, w1 := io.Pipe()
c1 := &conn{raddr: "10.0.0.1:8333", Writer: w1, Reader: r1}
p1, err := peer.NewOutboundPeer(peerCfg, "10.0.0.1:8333") p1, err := peer.NewOutboundPeer(peerCfg, "10.0.0.1:8333")
if err != nil { if err != nil {
t.Errorf("NewOutboundPeer: unexpected err - %v\n", err) t.Errorf("NewOutboundPeer: unexpected err - %v\n", err)
return return
} }
if err := p1.Connect(c); err != nil { if err := p1.Connect(c1); err != nil {
t.Errorf("Connect: unexpected err %v\n", err) t.Errorf("Connect: unexpected err %v\n", err)
return return
} }
@ -615,12 +617,14 @@ func TestOutboundPeer(t *testing.T) {
// Test regression // Test regression
peerCfg.ChainParams = &chaincfg.RegressionNetParams peerCfg.ChainParams = &chaincfg.RegressionNetParams
peerCfg.Services = wire.SFNodeBloom peerCfg.Services = wire.SFNodeBloom
r2, w2 := io.Pipe()
c2 := &conn{raddr: "10.0.0.1:8333", Writer: w2, Reader: r2}
p2, err := peer.NewOutboundPeer(peerCfg, "10.0.0.1:8333") p2, err := peer.NewOutboundPeer(peerCfg, "10.0.0.1:8333")
if err != nil { if err != nil {
t.Errorf("NewOutboundPeer: unexpected err - %v\n", err) t.Errorf("NewOutboundPeer: unexpected err - %v\n", err)
return return
} }
if err := p2.Connect(c); err != nil { if err := p2.Connect(c2); err != nil {
t.Errorf("Connect: unexpected err %v\n", err) t.Errorf("Connect: unexpected err %v\n", err)
return return
} }
@ -647,11 +651,11 @@ func TestOutboundPeer(t *testing.T) {
p2.PushRejectMsg("block", wire.RejectInvalid, "invalid", nil, false) p2.PushRejectMsg("block", wire.RejectInvalid, "invalid", nil, false)
// Test Queue Messages // Test Queue Messages
p2.QueueMessage(wire.NewMsgGetAddr(), done) p2.QueueMessage(wire.NewMsgGetAddr(), nil)
p2.QueueMessage(wire.NewMsgPing(1), done) p2.QueueMessage(wire.NewMsgPing(1), nil)
p2.QueueMessage(wire.NewMsgMemPool(), done) p2.QueueMessage(wire.NewMsgMemPool(), nil)
p2.QueueMessage(wire.NewMsgGetData(), done) p2.QueueMessage(wire.NewMsgGetData(), nil)
p2.QueueMessage(wire.NewMsgGetHeaders(), done) p2.QueueMessage(wire.NewMsgGetHeaders(), nil)
p2.Shutdown() p2.Shutdown()
} }