8000 fix: resolve flakey inbox tests by DanielleMaywood · Pull Request #17010 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

fix: resolve flakey inbox tests #17010

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 2 commits into from
Mar 19, 2025
Merged

fix: resolve flakey inbox tests #17010

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
042b159
chore: add error checking
DanielleMaywood Mar 19, 2025
d292acd
chore: re-order websocket accept
DanielleMaywood Mar 19, 2025
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
Prev Previous commit
chore: re-order websocket accept
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Mar 19, 2025
commit d292acdd55cfd61cf3b02a45819e450edbf13a72
25 changes: 12 additions & 13 deletions coderd/inboxnotifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,6 @@ func (api *API) watchInboxNotifications(rw http.ResponseWriter, r *http.Request)
return
}

conn, err := websocket.Accept(rw, r, nil)
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Failed to upgrade connection to websocket.",
Detail: err.Error(),
})
return
}

go httpapi.Heartbeat(ctx, conn)
defer conn.Close(websocket.StatusNormalClosure, "connection closed")

notificationCh := make(chan codersdk.InboxNotification, 10)

closeInboxNotificationsSubscriber, err := api.Pubsub.SubscribeWithErr(pubsub.InboxNotificationForOwnerEventChannel(apikey.UserID),
Expand Down Expand Up @@ -161,9 +149,20 @@ func (api *API) watchInboxNotifications(rw http.ResponseWriter, r *http.Request)
api.Logger.Error(ctx, "subscribe to inbox notification event", slog.Error(err))
return
}

defer closeInboxNotificationsSubscriber()

conn, err := websocket.Accept(rw, r, nil)
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Failed to upgrade connection to websocket.",
Detail: err.Error(),
})
return
}

go httpapi.Heartbeat(ctx, conn)
defer conn.Close(websocket.StatusNormalClosure, "connection closed")

encoder := wsjson.NewEncoder[codersdk.GetInboxNotificationResponse](conn, websocket.MessageText)
defer encoder.Close(websocket.StatusNormalClosure)

Expand Down
Loading
0