interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rpc: add missing timer.Stop calls in websocket tests (#20863)

This commit is contained in:
ucwong 2020-04-03 04:08:45 +08:00 committed by GitHub
parent f98cabad7c
commit f7b29ec942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/websocket_test.go
View File

@ -142,6 +142,7 @@ func TestClientWebsocketPing(t *testing.T) {
// Wait for the subscription result. // Wait for the subscription result.
timeout := time.NewTimer(5 * time.Second) timeout := time.NewTimer(5 * time.Second)
defer timeout.Stop()
for { for {
select { select {
case err := <-sub.Err(): case err := <-sub.Err():
@ -227,9 +228,11 @@ func wsPingTestHandler(t *testing.T, conn *websocket.Conn, shutdown, sendPing <-
// Write messages. // Write messages.
var ( var (
sendResponse <-chan time.Time wantPong string
wantPong string timer = time.NewTimer(0)
) )
defer timer.Stop()
<-timer.C
for { for {
select { select {
case _, open := <-sendPing: case _, open := <-sendPing:
@ -246,11 +249,10 @@ func wsPingTestHandler(t *testing.T, conn *websocket.Conn, shutdown, sendPing <-
t.Errorf("got pong with wrong data %q", data) t.Errorf("got pong with wrong data %q", data)
} }
wantPong = "" wantPong = ""
sendResponse = time.NewTimer(200 * time.Millisecond).C timer.Reset(200 * time.Millisecond)
case <-sendResponse: case <-timer.C:
t.Logf("server sending response") t.Logf("server sending response")
conn.WriteMessage(websocket.TextMessage, []byte(subNotify)) conn.WriteMessage(websocket.TextMessage, []byte(subNotify))
sendResponse = nil
case <-shutdown: case <-shutdown:
conn.Close() conn.Close()
return return