Merge pull request #1221 from karalabe/fix-p2p-dial-test

p2p: fix a close race in the dial test
This commit is contained in:
Felix Lange 2015-06-09 22:00:49 +02:00
commit e972a116ac

View File

@ -117,7 +117,6 @@ func TestServerDial(t *testing.T) {
t.Error("accept error:", err) t.Error("accept error:", err)
return return
} }
conn.Close()
accepted <- conn accepted <- conn
}() }()
@ -134,6 +133,8 @@ func TestServerDial(t *testing.T) {
select { select {
case conn := <-accepted: case conn := <-accepted:
defer conn.Close()
select { select {
case peer := <-connected: case peer := <-connected:
if peer.ID() != remid { if peer.ID() != remid {