Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
go-libp2p
Commits
2ae1424c
Unverified
Commit
2ae1424c
authored
Jan 28, 2018
by
Steven Allen
Committed by
GitHub
Jan 28, 2018
Browse files
Merge pull request #269 from libp2p/fix/identify-test
make the identify test less racy
parents
b624fe60
5f75373b
Changes
1
Hide whitespace changes
Inline
Side-by-side
p2p/protocol/identify/id_test.go
View file @
2ae1424c
...
@@ -35,7 +35,7 @@ func subtestIDService(t *testing.T) {
...
@@ -35,7 +35,7 @@ func subtestIDService(t *testing.T) {
forgetMe
,
_
:=
ma
.
NewMultiaddr
(
"/ip4/1.2.3.4/tcp/1234"
)
forgetMe
,
_
:=
ma
.
NewMultiaddr
(
"/ip4/1.2.3.4/tcp/1234"
)
h2
.
Peerstore
()
.
AddAddr
(
h1p
,
forgetMe
,
pstore
.
RecentlyConnectedAddrTTL
)
h2
.
Peerstore
()
.
AddAddr
(
h1p
,
forgetMe
,
pstore
.
RecentlyConnectedAddrTTL
)
time
.
Sleep
(
50
*
time
.
Millisecond
)
time
.
Sleep
(
50
0
*
time
.
Millisecond
)
h2pi
:=
h2
.
Peerstore
()
.
PeerInfo
(
h2p
)
h2pi
:=
h2
.
Peerstore
()
.
PeerInfo
(
h2p
)
if
err
:=
h1
.
Connect
(
ctx
,
h2pi
);
err
!=
nil
{
if
err
:=
h1
.
Connect
(
ctx
,
h2pi
);
err
!=
nil
{
...
@@ -83,12 +83,12 @@ func subtestIDService(t *testing.T) {
...
@@ -83,12 +83,12 @@ func subtestIDService(t *testing.T) {
testKnowsAddrs
(
t
,
h2
,
h1p
,
addrs
)
testKnowsAddrs
(
t
,
h2
,
h1p
,
addrs
)
testKnowsAddrs
(
t
,
h1
,
h2p
,
h2
.
Peerstore
()
.
Addrs
(
h2p
))
testKnowsAddrs
(
t
,
h1
,
h2p
,
h2
.
Peerstore
()
.
Addrs
(
h2p
))
time
.
Sleep
(
50
*
time
.
Millisecond
)
time
.
Sleep
(
50
0
*
time
.
Millisecond
)
// Forget the first one.
// Forget the first one.
testKnowsAddrs
(
t
,
h2
,
h1p
,
addrs
[
:
len
(
addrs
)
-
1
])
testKnowsAddrs
(
t
,
h2
,
h1p
,
addrs
[
:
len
(
addrs
)
-
1
])
time
.
Sleep
(
50
*
time
.
Millisecond
)
time
.
Sleep
(
50
0
*
time
.
Millisecond
)
// Forget the rest.
// Forget the rest.
testKnowsAddrs
(
t
,
h1
,
h2p
,
[]
ma
.
Multiaddr
{})
testKnowsAddrs
(
t
,
h1
,
h2p
,
[]
ma
.
Multiaddr
{})
...
@@ -152,12 +152,12 @@ func testHasPublicKey(t *testing.T, h host.Host, p peer.ID, shouldBe ic.PubKey)
...
@@ -152,12 +152,12 @@ func testHasPublicKey(t *testing.T, h host.Host, p peer.ID, shouldBe ic.PubKey)
}
}
}
}
// TestIDServiceWait gives the ID service 1
00m
s 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
// this is becasue it used to be concurrent. Now, Dial wait till the
// id service is done.
// id service is done.
func
TestIDService
(
t
*
testing
.
T
)
{
func
TestIDService
(
t
*
testing
.
T
)
{
oldTTL
:=
pstore
.
RecentlyConnectedAddrTTL
oldTTL
:=
pstore
.
RecentlyConnectedAddrTTL
pstore
.
RecentlyConnectedAddrTTL
=
100
*
time
.
Millis
econd
pstore
.
RecentlyConnectedAddrTTL
=
time
.
S
econd
defer
func
()
{
defer
func
()
{
pstore
.
RecentlyConnectedAddrTTL
=
oldTTL
pstore
.
RecentlyConnectedAddrTTL
=
oldTTL
}()
}()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment