github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25519 from jlowdermilk/no-trim

Browse Source 
Don't trim whitespace from kubectl output in e2e tests
This commit is contained in:
Jeff Lowdermilk
2016-05-13 13:01:22 -07:00
parent ba170aa191 5f0d1f04b8
commit 4aabafe4c3
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/kubectl.go
View File

@@ -246,7 +246,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)
}
@@ -270,7 +270,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)
}
})