deflake TestWebSocketClient_HeartbeatSucceeds

Change-Id: I1f3331255ed81183b25ec24084c00d0cf7dfb510

Kubernetes-commit: 4a74958b2df7ecd9e6a4867f7b10f1402cb2e215
This commit is contained in:
Antonio Ojea 2023-09-25 10:31:46 +00:00 committed by Kubernetes Publisher
parent 34d1b64e67
commit 011db228a8

View File

@ -1057,8 +1057,7 @@ func TestWebSocketClient_HeartbeatSucceeds(t *testing.T) {
for { for {
_, _, err := conn.ReadMessage() _, _, err := conn.ReadMessage()
if err != nil { if err != nil {
t.Logf("server err reading message: %v", err) break
return
} }
} }
})) }))
@ -1085,7 +1084,11 @@ func TestWebSocketClient_HeartbeatSucceeds(t *testing.T) {
return pongHandler(msg) return pongHandler(msg)
}) })
go heartbeat.start() go heartbeat.start()
var wg sync.WaitGroup
wg.Add(1)
go func() { go func() {
defer wg.Done()
for { for {
_, _, err := client.ReadMessage() _, _, err := client.ReadMessage()
if err != nil { if err != nil {
@ -1107,6 +1110,7 @@ func TestWebSocketClient_HeartbeatSucceeds(t *testing.T) {
close(heartbeat.closer) close(heartbeat.closer)
t.Errorf("unexpected heartbeat timeout") t.Errorf("unexpected heartbeat timeout")
} }
wg.Wait()
} }
func TestWebSocketClient_StreamsAndExpectedErrors(t *testing.T) { func TestWebSocketClient_StreamsAndExpectedErrors(t *testing.T) {