From 9759ac7816310e8c45a067c4286947dbfebf4817 Mon Sep 17 00:00:00 2001
From: ucwong <ucwong@126.com>
Date: Thu, 2 Apr 2020 10:50:02 +0000
Subject: [PATCH] rpc/websocket_test : add timer var to make sure the timer
 finally stopped

---
 rpc/websocket_test.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/rpc/websocket_test.go b/rpc/websocket_test.go
index 28a0f09d1b..65dbab681c 100644
--- a/rpc/websocket_test.go
+++ b/rpc/websocket_test.go
@@ -247,12 +247,9 @@ func wsPingTestHandler(t *testing.T, conn *websocket.Conn, shutdown, sendPing <-
 				t.Errorf("got pong with wrong data %q", data)
 			}
 			wantPong = ""
-			sendResponse = time.NewTimer(200 * time.Millisecond).C
-			defer func() {
-				if sendResponse != nil {
-					sendResponse.Stop()
-				}
-			}()
+			timer := time.NewTimer(200 * time.Millisecond)
+			defer timer.Stop()
+			sendResponse = timer.C
 		case <-sendResponse:
 			t.Logf("server sending response")
 			conn.WriteMessage(websocket.TextMessage, []byte(subNotify))