Skip to content

Fix(dot/rpc/subscription): Implement WebSocket connection synchronization for testing #3399

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
axaysagathiya merged 10 commits into from
Jul 25, 2023
Merged

Fix(dot/rpc/subscription): Implement WebSocket connection synchronization for testing #3399

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2beb1d4
improve test helper func to setup web socket conn
axaysagathiya Jul 21, 2023
6aeea83
clean up
axaysagathiya Jul 22, 2023
db7a979
Merge branch 'development' into issue-2944
axaysagathiya Jul 22, 2023
5b2eebf
clean up
axaysagathiya Jul 22, 2023
53e39b7
lint
axaysagathiya Jul 22, 2023
e8df5fc
extend ctx deadline for all nodes to be connected
axaysagathiya Jul 23, 2023
c2b5cee
draft
axaysagathiya Jul 23, 2023
47a0e0c
draft
axaysagathiya Jul 24, 2023
3de784d
clean up
axaysagathiya Jul 24, 2023
694450e
handle deepsource error
axaysagathiya Jul 24, 2023
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
12 changes: 11 additions & 1 deletion dot/rpc/subscription/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ func setupWSConn(t *testing.T) (*WSConn, *websocket.Conn, func()) {
CheckOrigin: func(r *http.Request) bool { return true },
}

// Use a channel to notify when the WebSocket connection is ready
connReady := make(chan struct{})

h := func(w http.ResponseWriter, r *http.Request) {
c, err := up.Upgrade(w, r, nil)
if err != nil {
Expand All @@ -30,17 +33,24 @@ func setupWSConn(t *testing.T) (*WSConn, *websocket.Conn, func()) {
}

wskt.Wsconn = c

// Notify that the WebSocket connection is ready
close(connReady)
}

server := httptest.NewServer(http.HandlerFunc(h))
defer server.Close()

wsURL := "ws" + strings.TrimPrefix(server.URL, "http")
ws, r, err := websocket.DefaultDialer.Dial(wsURL, nil)
defer r.Body.Close()
r.Body.Close()

require.NoError(t, err)

// Wait for the WebSocket connection to be ready before proceeding
<-connReady
require.NotNil(t, wskt.Wsconn)

cancel := func() {
server.Close()
ws.Close()
Expand Down