Skip to content

Commit

Permalink
Merge pull request #269 from libp2p/fix/identify-test
Browse files Browse the repository at this point in the history
make the identify test less racy
  • Loading branch information
Stebalien authored Jan 28, 2018
2 parents b624fe6 + 5f75373 commit 2ae1424
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions p2p/protocol/identify/id_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func subtestIDService(t *testing.T) {
forgetMe, _ := ma.NewMultiaddr("/ip4/1.2.3.4/tcp/1234")

h2.Peerstore().AddAddr(h1p, forgetMe, pstore.RecentlyConnectedAddrTTL)
time.Sleep(50 * time.Millisecond)
time.Sleep(500 * time.Millisecond)

h2pi := h2.Peerstore().PeerInfo(h2p)
if err := h1.Connect(ctx, h2pi); err != nil {
Expand Down Expand Up @@ -83,12 +83,12 @@ func subtestIDService(t *testing.T) {
testKnowsAddrs(t, h2, h1p, addrs)
testKnowsAddrs(t, h1, h2p, h2.Peerstore().Addrs(h2p))

time.Sleep(50 * time.Millisecond)
time.Sleep(500 * time.Millisecond)

// Forget the first one.
testKnowsAddrs(t, h2, h1p, addrs[:len(addrs)-1])

time.Sleep(50 * time.Millisecond)
time.Sleep(500 * time.Millisecond)

// Forget the rest.
testKnowsAddrs(t, h1, h2p, []ma.Multiaddr{})
Expand Down Expand Up @@ -152,12 +152,12 @@ func testHasPublicKey(t *testing.T, h host.Host, p peer.ID, shouldBe ic.PubKey)
}
}

// TestIDServiceWait gives the ID service 100ms to finish after dialing
// TestIDServiceWait gives the ID service 1s to finish after dialing
// this is becasue it used to be concurrent. Now, Dial wait till the
// id service is done.
func TestIDService(t *testing.T) {
oldTTL := pstore.RecentlyConnectedAddrTTL
pstore.RecentlyConnectedAddrTTL = 100 * time.Millisecond
pstore.RecentlyConnectedAddrTTL = time.Second
defer func() {
pstore.RecentlyConnectedAddrTTL = oldTTL
}()
Expand Down

0 comments on commit 2ae1424

Please sign in to comment.