Skip to content

Avoid potential double-close of channels due to reconnects after tests complete #458

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

Merged
merged 1 commit into from
Jan 29, 2022
Merged

Avoid potential double-close of channels due to reconnects after tests complete #458

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions pkg/wsclient/wsclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ func TestWSReadLoopSendFailure(t *testing.T) {
defer done()

wsconn, _, err := websocket.DefaultDialer.Dial(url, nil)
assert.NoError(t, err)
wsconn.WriteJSON(map[string]string{"type": "listen", "topic": "topic1"})
assert.NoError(t, err)
<-toServer
Expand All @@ -217,6 +218,10 @@ func TestWSReadLoopSendFailure(t *testing.T) {
// Ensure the readLoop exits immediately
w.readLoop()

// Try reconnect, should fail here
_, _, err = websocket.DefaultDialer.Dial(url, nil)
assert.Error(t, err)

}

func TestWSReconnectFail(t *testing.T) {
Expand Down
5 changes: 5 additions & 0 deletions pkg/wsclient/wstestserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ func NewTestWSServer(testReq func(req *http.Request)) (toServer, fromServer chan
if testReq != nil {
testReq(req)
}
if connected {
// test server only handles one open connection, as it only has one set of channels
res.WriteHeader(409)
return
}
ws, _ := upgrader.Upgrade(res, req, http.Header{})
go func() {
defer close(receiveDone)
Expand Down