From bbac9b5c3a6c6dd8bd6dc1c9c325636dbb285982 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Mon, 26 Feb 2018 16:04:37 -0600 Subject: [PATCH] UPSTREAM: 60457: tests: e2e: empty msg from channel other than stdout should be non-fatal --- vendor/k8s.io/kubernetes/test/e2e/common/pods.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vendor/k8s.io/kubernetes/test/e2e/common/pods.go b/vendor/k8s.io/kubernetes/test/e2e/common/pods.go index 755011fb5ae0..f2dab3cd6539 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/common/pods.go +++ b/vendor/k8s.io/kubernetes/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:]) }