command/run: handle errors returned from parallel.Manager (peak#351)

Co-authored-by: İbrahim Güngör <[email protected]>

Updates peak#304

command/run.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/hashicorp/go-multierror"
 	"github.com/kballard/go-shellquote"
 	"github.com/urfave/cli/v2"
 
@@ -63,12 +64,11 @@ func NewRunCommand() *cli.Command {
 			waiter := parallel.NewWaiter()
 
 			var errDoneCh = make(chan bool)
+			var merrorWaiter error
 			go func() {
 				defer close(errDoneCh)
-				for range waiter.Err() {
-					// app.ExitErrHandler is called after each command.Run
-					// invocation. Ignore the errors returned from parallel.Run,
-					// just drain the channel for synchronization.
+				for err := range waiter.Err() {
+					merrorWaiter = multierror.Append(merrorWaiter, err)
 				}
 			}()
 
@@ -130,7 +130,7 @@ func NewRunCommand() *cli.Command {
 			waiter.Wait()
 			<-errDoneCh
 
-			return scanner.Err()
+			return multierror.Append(merrorWaiter, scanner.Err()).ErrorOrNil()
 		},
 	}
 }

e2e/run_test.go

@@ -62,7 +62,7 @@ func TestRunFromStdinWithErrors(t *testing.T) {
 	cmd := s5cmd("run")
 	result := icmd.RunCmd(cmd, icmd.WithStdin(input))
 
-	result.Assert(t, icmd.Success)
+	result.Assert(t, icmd.Expected{ExitCode: 1})
 
 	assertLines(t, result.Stdout(), map[int]compareFunc{})