scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31758 from vishh/issue-30567

Browse Source 
Automatic merge from submit-queue

Make pods e2e retry getting logs from web-sockets

Hopefully fixes #30567
This commit is contained in:
Kubernetes Submit Queue
2016-08-31 18:32:47 -07:00
committed by GitHub
parent 3269849ded 8d74371537
commit b03de0abe7
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/common/pods.go
View File

@@ -491,6 +491,7 @@ var _ = framework.KubeDescribe("Pods", func() {
defer ws.Close()
buf := &bytes.Buffer{}
Eventually(func() error {
for {
var msg []byte
if err := websocket.Message.Receive(ws, &msg); err != nil {
@@ -508,11 +509,13 @@ var _ = framework.KubeDescribe("Pods", func() {
buf.Write(msg[1:])
}
if buf.Len() == 0 {
framework.Failf("Unexpected output from server")
return fmt.Errorf("Unexpected output from server")
}
if !strings.Contains(buf.String(), "nameserver") {
framework.Failf("Expected to find 'nameserver' in %q", buf.String())
return fmt.Errorf("Expected to find 'nameserver' in %q", buf.String())
}
return nil
}, time.Minute, 10*time.Second).Should(BeNil())
})
It("should support retrieving logs from the container over websockets", func() {