Use multierror

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

Gopkg.lock

@@ -134,6 +134,10 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/dustin/go-humanize"
   version = "1.0.0"
 
+[[constraint]]
+  name = "github.com/hashicorp/go-multierror"
+  version = "1.0.0"
+
 [prune]
   non-go = true
   unused-packages = true

Gopkg.toml

@@ -120,6 +120,9 @@ func TestImageRmForce(t *testing.T) {
 
 		cmd.Command = dockerCli.Command("app", "image", "rm", "--force", imageID)
 		icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+		expectedOutput := "REPOSITORY          TAG                 APP IMAGE ID        APP NAME            CREATED             \n"
+		expectImageListOutput(t, cmd, expectedOutput)
 	})
 }
 

e2e/images_test.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/docker/app/internal/relocated"
-
 	"github.com/docker/distribution/reference"
+	multierror "github.com/hashicorp/go-multierror"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 )
@@ -118,15 +118,15 @@ func (b *bundleStore) Remove(ref reference.Reference, force bool) error {
 		if len(refs) == 0 {
 			return fmt.Errorf("no such image %q", reference.FamiliarString(ref))
 		} else if len(refs) > 1 {
-			var failure error
 			if force {
+				var failures *multierror.Error
 				toDelete := append([]reference.Reference{}, refs...)
 				for _, r := range toDelete {
 					if err := b.doRemove(r); err != nil {
-						failure = err
+						failures = multierror.Append(failures, err)
 					}
 				}
-				return failure
+				return failures.ErrorOrNil()
 			}
 			return fmt.Errorf("unable to delete %q - App is referenced in multiple repositories", reference.FamiliarString(ref))
 		}