Skip to content

test(network/grpc): fix race in Test_grpcConnectionManager_Peers #4276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevenvegt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test(network/grpc): fix race in Test_grpcConnectionManager_Peers #4276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions network/transport/grpc/connection_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ func Test_grpcConnectionManager_Peers(t *testing.T) {
}, time.Second*2, "waiting for peer 1 to connect")
})
t.Run("outbound stream triggers observer", func(t *testing.T) {
_, authenticator1, _, listener := create(t)
cm1, authenticator1, _, listener := create(t)
cm2, authenticator2, _, _ := create(t, withBufconnDialer(listener))
authenticator1.EXPECT().Authenticate(*nodeDID, gomock.Any()).Return(transport.Peer{ID: "1"}, nil)
authenticator2.EXPECT().Authenticate(*nodeDID, gomock.Any()).Return(transport.Peer{ID: "2"}, nil)
Expand All @@ -506,9 +506,11 @@ func Test_grpcConnectionManager_Peers(t *testing.T) {

cm2.Connect("bufnet", *nodeDID, nil)

// Wait until both sides have authenticated, otherwise the mock controller may
// run Finish() before authenticator1 fires and report a missing call.
test.WaitFor(t, func() (bool, error) {
return capturedPeer.Load() != nil, nil
}, time.Second*2, "waiting for peer 2 observers")
return capturedPeer.Load() != nil && len(cm1.Peers()) > 0, nil
}, time.Second*2, "waiting for both sides to authenticate")
assert.Equal(t, transport.Peer{ID: "2"}, capturedPeer.Load())
assert.Equal(t, transport.StateConnected, capturedState.Load())

Expand All @@ -532,9 +534,11 @@ func Test_grpcConnectionManager_Peers(t *testing.T) {

cm2.Connect("bufnet", *nodeDID, nil)

// Wait until both sides have authenticated, otherwise the mock controller may
// run Finish() before authenticator2 fires and report a missing call.
test.WaitFor(t, func() (bool, error) {
return capturedPeer.Load() != nil, nil
}, time.Second*2, "waiting for peer 1 observers")
return capturedPeer.Load() != nil && len(cm2.Peers()) > 0, nil
}, time.Second*2, "waiting for both sides to authenticate")
assert.Equal(t, transport.Peer{ID: "1"}, capturedPeer.Load())
assert.Equal(t, transport.StateConnected, capturedState.Load())

Expand Down
Loading