From 5f0d1f04b8c10064498ae5ee53adc763bc718673 Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Wed, 11 May 2016 18:40:58 -0700 Subject: [PATCH] Don't trim whitespace from kubectl output in e2e tests --- test/e2e/framework/util.go | 3 +-- test/e2e/kubectl.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 6d7749806a8..531f2a4c44a 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1550,8 +1550,7 @@ func (b kubectlBuilder) Exec() (string, error) { return "", fmt.Errorf("Timed out waiting for command %v:\nCommand stdout:\n%v\nstderr:\n%v\n", cmd, cmd.Stdout, cmd.Stderr) } Logf("stderr: %q", stderr.String()) - // TODO: trimspace should be unnecessary after switching to use kubectl binary directly - return strings.TrimSpace(stdout.String()), nil + return stdout.String(), nil } // RunKubectlOrDie is a convenience wrapper over kubectlBuilder diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 8a246012e71..38d8d647aa2 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -220,7 +220,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { It("should support exec", func() { By("executing a command in the container") execOutput := framework.RunKubectlOrDie("exec", fmt.Sprintf("--namespace=%v", ns), simplePodName, "echo", "running", "in", "container") - if e, a := "running in container", execOutput; e != a { + if e, a := "running in container", strings.TrimSpace(execOutput); e != a { framework.Failf("Unexpected kubectl exec output. Wanted %q, got %q", e, a) } @@ -244,7 +244,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() { execOutput = framework.NewKubectlCommand("exec", fmt.Sprintf("--namespace=%v", ns), "-i", simplePodName, "bash"). WithStdinReader(r). ExecOrDie() - if e, a := "hi", execOutput; e != a { + if e, a := "hi", strings.TrimSpace(execOutput); e != a { framework.Failf("Unexpected kubectl exec output. Wanted %q, got %q", e, a) } })