Skip to content

Commit f3195e9

Browse files
swarm: only dial a single transport in TestDialWorkerLoopBasic (#1526)
1 parent 6c56eea commit f3195e9

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

p2p/net/swarm/dial_worker_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ func TestDialWorkerLoopBasic(t *testing.T) {
8484
defer s1.Close()
8585
defer s2.Close()
8686

87-
s1.Peerstore().AddAddrs(s2.LocalPeer(), s2.ListenAddresses(), peerstore.PermanentAddrTTL)
87+
// Only pass in a single address here, otherwise we might end up with a TCP and QUIC connection dialed.
88+
s1.Peerstore().AddAddrs(s2.LocalPeer(), []ma.Multiaddr{s2.ListenAddresses()[0]}, peerstore.PermanentAddrTTL)
8889

8990
reqch := make(chan dialRequest)
9091
resch := make(chan dialResponse)
@@ -97,7 +98,7 @@ func TestDialWorkerLoopBasic(t *testing.T) {
9798
case res := <-resch:
9899
require.NoError(t, res.err)
99100
conn = res.conn
100-
case <-time.After(time.Minute):
101+
case <-time.After(10 * time.Second):
101102
t.Fatal("dial didn't complete")
102103
}
103104

@@ -111,13 +112,13 @@ func TestDialWorkerLoopBasic(t *testing.T) {
111112
case res := <-resch:
112113
require.NoError(t, res.err)
113114
conn2 = res.conn
114-
case <-time.After(time.Minute):
115+
case <-time.After(10 * time.Second):
115116
t.Fatal("dial didn't complete")
116117
}
117118

118119
// can't use require.Equal here, as this does a deep comparison
119120
if conn != conn2 {
120-
t.Fatal("expecting the same connection from both dials")
121+
t.Fatalf("expecting the same connection from both dials. %s <-> %s vs. %s <-> %s", conn.LocalMultiaddr(), conn.RemoteMultiaddr(), conn2.LocalMultiaddr(), conn2.RemoteMultiaddr())
121122
}
122123

123124
close(reqch)

0 commit comments

Comments
 (0)