Merge pull request #120865 from aojea/remotecmd_flake

deflake TestWebSocketClient_HeartbeatSucceeds
This commit is contained in:
Kubernetes Prow Robot 2023-09-26 06:50:14 -07:00 committed by GitHub
commit e602e9e03c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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