Fix cleanup error on content client test

dmcgowan · fuweid · commit 04fbb97ad016 · 2019-11-27T23:01:10.000+08:00
A race occurs today where the cleanup runs after the lease has been deleted, making all the content and statuses eligible for collection during the cleanup. There is a case where a status could be listed but removed before the abort is called. In this case, abort will return a not found and the test cleanup should ignore it. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (cherry picked from commit 8da4346) Signed-off-by: Wei Fu <fuweid89@gmail.com>
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`	`}`