cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

p2p/discover: deflake TestUDP_successfulPing

Browse Source
This commit is contained in:
Felix Lange 2015-06-10 13:07:30 +02:00
parent dffe6d32d6
commit 261a8077c4
2 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
p2p/discover/table.go
View File

@ -40,6 +40,8 @@ type Table struct {
bonding map[NodeID]*bondproc bonding map[NodeID]*bondproc
bondslots chan struct{} // limits total number of active bonding processes bondslots chan struct{} // limits total number of active bonding processes
nodeAddedHook func(*Node) // for testing
net transport net transport
self *Node // metadata of the local node self *Node // metadata of the local node
} }
@ -431,6 +433,9 @@ func (tab *Table) pingreplace(new *Node, b *bucket) {
} }
copy(b.entries[1:], b.entries) copy(b.entries[1:], b.entries)
b.entries[0] = new b.entries[0] = new
if tab.nodeAddedHook != nil {
tab.nodeAddedHook(new)
}
} }
// ping a remote endpoint and wait for a reply, also updating the node database // ping a remote endpoint and wait for a reply, also updating the node database
@ -466,6 +471,9 @@ outer:
} }
if len(bucket.entries) < bucketSize { if len(bucket.entries) < bucketSize {
bucket.entries = append(bucket.entries, n) bucket.entries = append(bucket.entries, n)
if tab.nodeAddedHook != nil {
tab.nodeAddedHook(n)
}
} }
} }
} }

45
p2p/discover/udp_test.go
View File

@ -234,14 +234,12 @@ func TestUDP_findnodeMultiReply(t *testing.T) {
func TestUDP_successfulPing(t *testing.T) { func TestUDP_successfulPing(t *testing.T) {
test := newUDPTest(t) test := newUDPTest(t)
added := make(chan *Node, 1)
test.table.nodeAddedHook = func(n *Node) { added <- n }
defer test.table.Close() defer test.table.Close()
done := make(chan struct{})
go func() {
// The remote side sends a ping packet to initiate the exchange. // The remote side sends a ping packet to initiate the exchange.
test.packetIn(nil, pingPacket, &ping{From: testRemote, To: testLocalAnnounced, Version: Version, Expiration: futureExp}) go test.packetIn(nil, pingPacket, &ping{From: testRemote, To: testLocalAnnounced, Version: Version, Expiration: futureExp})
close(done)
}()
// the ping is replied to. // the ping is replied to.
test.waitPacketOut(func(p *pong) { test.waitPacketOut(func(p *pong) {
@ -277,35 +275,26 @@ func TestUDP_successfulPing(t *testing.T) {
}) })
test.packetIn(nil, pongPacket, &pong{Expiration: futureExp}) test.packetIn(nil, pongPacket, &pong{Expiration: futureExp})
// ping should return shortly after getting the pong packet. // the node should be added to the table shortly after getting the
<-done // pong packet.
select {
// check that the node was added. case n := <-added:
rid := PubkeyID(&test.remotekey.PublicKey) rid := PubkeyID(&test.remotekey.PublicKey)
rnode := find(test.table, rid) if n.ID != rid {
if rnode == nil { t.Errorf("node has wrong ID: got %v, want %v", n.ID, rid)
t.Fatalf("node %v not found in table", rid)
} }
if !bytes.Equal(rnode.IP, test.remoteaddr.IP) { if !bytes.Equal(n.IP, test.remoteaddr.IP) {
t.Errorf("node has wrong IP: got %v, want: %v", rnode.IP, test.remoteaddr.IP) t.Errorf("node has wrong IP: got %v, want: %v", n.IP, test.remoteaddr.IP)
} }
if int(rnode.UDP) != test.remoteaddr.Port { if int(n.UDP) != test.remoteaddr.Port {
t.Errorf("node has wrong UDP port: got %v, want: %v", rnode.UDP, test.remoteaddr.Port) t.Errorf("node has wrong UDP port: got %v, want: %v", n.UDP, test.remoteaddr.Port)
} }
if rnode.TCP != testRemote.TCP { if n.TCP != testRemote.TCP {
t.Errorf("node has wrong TCP port: got %v, want: %v", rnode.TCP, testRemote.TCP) t.Errorf("node has wrong TCP port: got %v, want: %v", n.TCP, testRemote.TCP)
} }
case <-time.After(2 * time.Second):
t.Errorf("node was not added within 2 seconds")
} }
func find(tab *Table, id NodeID) *Node {
for _, b := range tab.buckets {
for _, e := range b.entries {
if e.ID == id {
return e
}
}
}
return nil
} }
// dgramPipe is a fake UDP socket. It queues all sent datagrams. // dgramPipe is a fake UDP socket. It queues all sent datagrams.