Revert "Merge pull request #342 from cloudfoundry/PR-more-verbose-ssh"

This reverts commit 22f6060, reversing changes made to 28fd15b. Signed-off-by: Steve Taylor <[email protected]>
cloudfoundry · Oct 26, 2018 · 1d28297 · 1d28297
1 parent 383c445
commit 1d28297
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/ssh/ssh.go b/ssh/ssh.go
@@ -109,9 +109,6 @@ var _ = SshDescribe("SSH", func() {
 			stdout, err := envCmd.StdoutPipe()
 			Expect(err).NotTo(HaveOccurred())
 
-			stderr, err := envCmd.StderrPipe()
-			Expect(err).NotTo(HaveOccurred())
-
 			err = envCmd.Start()
 			Expect(err).NotTo(HaveOccurred())
 
@@ -121,16 +118,12 @@ var _ = SshDescribe("SSH", func() {
 			err = stdin.Close()
 			Expect(err).NotTo(HaveOccurred())
 
-			exitErr := envCmd.Wait()
-
 			output, err := ioutil.ReadAll(stdout)
 			Expect(err).NotTo(HaveOccurred())
 
-			errOutput, err := ioutil.ReadAll(stderr)
+			err = envCmd.Wait()
 			Expect(err).NotTo(HaveOccurred())
 
-			Expect(exitErr).NotTo(HaveOccurred(), "Failed to run SSH command: %s, %s", output, errOutput)
-
 			Expect(string(output)).To(MatchRegexp(fmt.Sprintf(`VCAP_APPLICATION=.*"application_name":"%s"`, appName)))
 			Expect(string(output)).To(MatchRegexp("INSTANCE_INDEX=0"))