Merge pull request #3856 from fuweid/cp-1.2-3853

dmcgowan · web-flow · commit ec48c9501579 · 2019-11-27T11:10:25.000-08:00
[release 1.2] Fix cleanup error on content client test
diff --git a/content_test.go b/content_test.go
@@ -57,7 +57,7 @@ func newContentStore(ctx context.Context, root string) (context.Context, content
 				return err
 			}
 			for _, st := range statuses {
-				if err := cs.Abort(ctx, st.Ref); err != nil {
+				if err := cs.Abort(ctx, st.Ref); err != nil && !errdefs.IsNotFound(err) {
 					return errors.Wrapf(err, "failed to abort %s", st.Ref)
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func newContentStore(ctx context.Context, root string) (context.Context, content`
`57`	`57`	`return err`
`58`	`58`	`}`
`59`	`59`	`for _, st := range statuses {`
`60`		`- if err := cs.Abort(ctx, st.Ref); err != nil {`
	`60`	`+ if err := cs.Abort(ctx, st.Ref); err != nil && !errdefs.IsNotFound(err) {`
`61`	`61`	`return errors.Wrapf(err, "failed to abort %s", st.Ref)`
`62`	`62`	`}`
`63`	`63`	`}`