[sshcmd] Fix race condition

marcoguerri · marcoguerri · commit 17d04b8fc928 · 2020-02-21T18:33:06.000Z
Stdout should be written when the channel has already returned the result
of the command.
diff --git a/plugins/teststeps/sshcmd/sshcmd.go b/plugins/teststeps/sshcmd/sshcmd.go
@@ -185,10 +185,12 @@ func (ts *SSHCmd) Run(cancel, pause <-chan struct{}, ch test.TestStepChannels, p
 		}()
 
 		// TODO should stdout/stderr go to events?
-		log.Infof("Stdout of command '%s' is '%s'", cmd, stdout.Bytes())
 		select {
 		case err := <-errCh:
-			log.Warningf("Stderr of command '%s' is '%s'", cmd, stderr.Bytes())
+			log.Infof("Stdout of command '%s' is '%s'", cmd, stdout.Bytes())
+			if err != nil {
+				log.Warningf("Stderr of command '%s' is '%s'", cmd, stderr.Bytes())
+			}
 			return err
 		case <-cancel:
 			return session.Signal(ssh.SIGKILL)
