github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120865 from aojea/remotecmd_flake

Browse Source 
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
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/client-go/tools/remotecommand/websocket_test.go
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) {