Strip whitespace when comparing endpoints in services test.

This commit is contained in:
Prashanth Balasubramanian
2016-02-25 13:09:17 -08:00
parent df234d83cd
commit 9be53e6319
2 changed files with 20 additions and 11 deletions

View File

@@ -1351,6 +1351,7 @@ func (b kubectlBuilder) withStdinReader(reader io.Reader) *kubectlBuilder {
func (b kubectlBuilder) execOrDie() string {
str, err := b.exec()
Logf("stdout: %q", str)
Expect(err).NotTo(HaveOccurred())
return str
}
@@ -1377,7 +1378,6 @@ func (b kubectlBuilder) exec() (string, error) {
b.cmd.Process.Kill()
return "", fmt.Errorf("Timed out waiting for command %v:\nCommand stdout:\n%v\nstderr:\n%v\n", cmd, cmd.Stdout, cmd.Stderr)
}
Logf("stdout: %q", stdout.String())
Logf("stderr: %q", stderr.String())
// TODO: trimspace should be unnecessary after switching to use kubectl binary directly
return strings.TrimSpace(stdout.String()), nil