From eb616bd6186cdc949304b592519844efec2be1bc Mon Sep 17 00:00:00 2001 From: ucwong Date: Thu, 2 Apr 2020 14:47:39 +0000 Subject: [PATCH] rpc : init timer at first --- rpc/websocket_test.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/rpc/websocket_test.go b/rpc/websocket_test.go index b79597cdf1..602b96746e 100644 --- a/rpc/websocket_test.go +++ b/rpc/websocket_test.go @@ -232,12 +232,9 @@ func wsPingTestHandler(t *testing.T, conn *websocket.Conn, shutdown, sendPing <- wantPong string timer *Timer ) - //timer := time.NewTimer(200 * time.Millisecond) - defer func() { - if timer != nil { - timer.Stop() - } - }() + timer := time.NewTimer(0) + defer timer.Stop() + <-timer.C for { select { case _, open := <-sendPing: @@ -254,11 +251,7 @@ func wsPingTestHandler(t *testing.T, conn *websocket.Conn, shutdown, sendPing <- t.Errorf("got pong with wrong data %q", data) } wantPong = "" - if timer == nil { - timer = time.NewTimer(200 * time.Millisecond) - } else { - timer.Reset(200 * time.Millisecond) - } + timer.Reset(200 * time.Millisecond) sendResponse = timer.C case <-sendResponse: t.Logf("server sending response")