github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

content/testsuite: pass context to hold lease

Browse Source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2018-01-29 16:24:33 -08:00
parent c517a005b5
commit 3295bca5bf
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
metadata/content_test.go
View File

@@ -17,19 +17,19 @@ import (
"github.com/pkg/errors"
)
func createContentStore(ctx context.Context, root string) (content.Store, func() error, error) {
func createContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) {
// TODO: Use mocked or in-memory store
cs, err := local.NewStore(root)
if err != nil {
return nil, nil, err
return nil, nil, nil, err
}
db, err := bolt.Open(filepath.Join(root, "metadata.db"), 0660, nil)
if err != nil {
return nil, nil, err
return nil, nil, nil, err
}
return NewDB(db, cs, nil).ContentStore(), func() error {
return ctx, NewDB(db, cs, nil).ContentStore(), func() error {
return db.Close()
}, nil
}