make pods e2e retry getting logs from web-sockets

Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan 2016-08-30 17:11:48 -07:00
parent f839c5ffdf
commit 8d74371537

View File

@ -491,6 +491,7 @@ var _ = framework.KubeDescribe("Pods", func() {
defer ws.Close() defer ws.Close()
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
Eventually(func() error {
for { for {
var msg []byte var msg []byte
if err := websocket.Message.Receive(ws, &msg); err != nil { if err := websocket.Message.Receive(ws, &msg); err != nil {
@ -508,11 +509,13 @@ var _ = framework.KubeDescribe("Pods", func() {
buf.Write(msg[1:]) buf.Write(msg[1:])
} }
if buf.Len() == 0 { if buf.Len() == 0 {
framework.Failf("Unexpected output from server") return fmt.Errorf("Unexpected output from server")
} }
if !strings.Contains(buf.String(), "nameserver") { 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() { It("should support retrieving logs from the container over websockets", func() {