Merge pull request #60457 from sjenning/fix-websocket-e2e-test

Automatic merge from submit-queue (batch tested with PRs 60457, 60331, 54970, 58731, 60562). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. tests: e2e: empty msg from channel other than stdout should be non-fatal Currently, if the exec websocket encounters a message that is not in the stdout stream, it immediately fails. However it also currently requests the stderr steam in the query params. There doesn't seem to be any guarantee that we don't get an empty message on the stderr stream. Requesting the stderr stream in the query is desirable if, for some reason, something in the container fails and writes to stderr. However, we do not need fail the test if we get an empty message on another stream. If the message is not empty, then that _does_ indicate and error and we should fail. This is the situation we are currently observing with docker 1.13 in the origin CI https://github.com/openshift/origin/issues/18726 @derekwaynecarr @smarterclayton @gabemontero @liggitt @deads2k /sig node

Merge pull request #60457 from sjenning/fix-websocket-e2e-test
8c3b5541 · Kubernetes Submit Queue · GitHub · b73c937f · 0639f1de · 8c3b5541
Unverified Commit 8c3b5541 authored Mar 19, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

pods.go test/e2e/common/pods.go +7 -1

No files found.
--- a/test/e2e/common/pods.go
+++ b/test/e2e/common/pods.go
@@ -523,7 +523,13 @@ var _ = framework.KubeDescribe("Pods", func() {
 					continue
 				}
 				if msg[0] != 1 {
-					framework.Failf("Got message from server that didn't start with channel 1 (STDOUT): %v", msg)
+					if len(msg) == 1 {
+						// skip an empty message on stream other than stdout
+						continue
+					} else {
+						framework.Failf("Got message from server that didn't start with channel 1 (STDOUT): %v", msg)
+					}
+
 				}
 				buf.Write(msg[1:])
 			}