Fix some test flakes

topfreegames · Sep 13, 2023 · fe6afa5 · fe6afa5
1 parent 803d84b
commit fe6afa5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/acceptor/ws_acceptor_test.go b/acceptor/ws_acceptor_test.go
@@ -84,7 +84,6 @@ func mustConnectToWS(t *testing.T, write []byte, w *WSAcceptor, protocol string)
 		conn, _, err := dialer.Dial(addr, nil)
 		dialer.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
 		conn.WriteMessage(websocket.BinaryMessage, write)
-		defer conn.Close()
 		return err
 	}, nil, 30*time.Millisecond, 100*time.Millisecond)
 }
@@ -98,7 +97,6 @@ func TestWSAcceptorListenAndServe(t *testing.T) {
 			go w.ListenAndServe()
 			mustConnectToWS(t, table.write, w, "ws")
 			conn := helpers.ShouldEventuallyReceive(t, c, 100*time.Millisecond).(*WSConn)
-			defer conn.Close()
 			assert.NotNil(t, conn)
 		})
 	}
@@ -113,7 +111,6 @@ func TestWSAcceptorListenAndServeTLS(t *testing.T) {
 			go w.ListenAndServeTLS("./fixtures/server.crt", "./fixtures/server.key")
 			mustConnectToWS(t, table.write, w, "wss")
 			conn := helpers.ShouldEventuallyReceive(t, c, 100*time.Millisecond).(*WSConn)
-			defer conn.Close()
 			assert.NotNil(t, conn)
 		})
 	}
@@ -142,7 +139,6 @@ func TestWSConnRead(t *testing.T) {
 			go w.ListenAndServe()
 			mustConnectToWS(t, table.write, w, "ws")
 			conn := helpers.ShouldEventuallyReceive(t, c, 100*time.Millisecond).(*WSConn)
-			defer conn.Close()
 			b := make([]byte, len(table.write))
 			n, err := conn.Read(b)
 			assert.NoError(t, err)
@@ -161,7 +157,6 @@ func TestWSConnWrite(t *testing.T) {
 			go w.ListenAndServe()
 			mustConnectToWS(t, table.write, w, "ws")
 			conn := helpers.ShouldEventuallyReceive(t, c, 100*time.Millisecond).(*WSConn)
-			defer conn.Close()
 			b := make([]byte, len(table.write))
 			n, err := conn.Write(b)
 			assert.NoError(t, err)
@@ -179,7 +174,6 @@ func TestWSConnLocalAddr(t *testing.T) {
 			go w.ListenAndServe()
 			mustConnectToWS(t, table.write, w, "ws")
 			conn := helpers.ShouldEventuallyReceive(t, c, 100*time.Millisecond).(*WSConn)
-			defer conn.Close()
 			a := conn.LocalAddr().String()
 			assert.NotEmpty(t, a)
 		})
@@ -195,7 +189,6 @@ func TestWSConnRemoteAddr(t *testing.T) {
 			go w.ListenAndServe()
 			mustConnectToWS(t, table.write, w, "ws")
 			conn := helpers.ShouldEventuallyReceive(t, c, 100*time.Millisecond).(*WSConn)
-			defer conn.Close()
 			a := conn.RemoteAddr().String()
 			assert.NotEmpty(t, a)
 		})
@@ -211,7 +204,6 @@ func TestWSConnSetDeadline(t *testing.T) {
 			go w.ListenAndServe()
 			mustConnectToWS(t, table.write, w, "ws")
 			conn := helpers.ShouldEventuallyReceive(t, c, 100*time.Millisecond).(*WSConn)
-			defer conn.Close()
 			conn.SetDeadline(time.Now().Add(5 * time.Millisecond))
 			time.Sleep(10 * time.Millisecond)
 			_, err := conn.Write(table.write)

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -215,7 +215,7 @@ func TestAgentSendSerializeErr(t *testing.T) {
 	sessionPool := session.NewSessionPool()
 	ag := &agentImpl{ // avoid heartbeat and handshake to fully test serialize
 		conn:             mockConn,
-		chSend:           make(chan pendingWrite, 1),
+		chSend:           make(chan pendingWrite, 10),
 		encoder:          mockEncoder,
 		heartbeatTimeout: time.Second,
 		lastAt:           time.Now().Unix(),
@@ -982,7 +982,7 @@ func TestAgentWriteChSend(t *testing.T) {
 	mockMetricsReporters := []metrics.Reporter{mockMetricsReporter}
 	ag := &agentImpl{ // avoid heartbeat and handshake to fully test serialize
 		conn:             mockConn,
-		chSend:           make(chan pendingWrite, 1),
+		chSend:           make(chan pendingWrite, 10),
 		encoder:          mockEncoder,
 		heartbeatTimeout: time.Second,
 		lastAt:           time.Now().Unix(),