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

Add gc labels to content tests

Browse Source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2017-10-18 17:43:51 -07:00
parent 56b6a5dbd1
commit 72fb8f8f40
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
content/testsuite/testsuite.go
View File

@ -52,6 +52,10 @@ func makeTest(t *testing.T, name string, storeFn func(ctx context.Context, root
} }
} }
var labels = map[string]string{
"containerd.io/gc.root": time.Now().UTC().Format(time.RFC3339),
}
func checkContentStoreWriter(ctx context.Context, t *testing.T, cs content.Store) { func checkContentStoreWriter(ctx context.Context, t *testing.T, cs content.Store) {
c1, d1 := createContent(256, 1) c1, d1 := createContent(256, 1)
w1, err := cs.Writer(ctx, "c1", 0, "") w1, err := cs.Writer(ctx, "c1", 0, "")
@ -118,7 +122,7 @@ func checkContentStoreWriter(ctx context.Context, t *testing.T, cs content.Store
} }
preCommit := time.Now() preCommit := time.Now()
if err := s.writer.Commit(ctx, 0, ""); err != nil { if err := s.writer.Commit(ctx, 0, "", content.WithLabels(labels)); err != nil {
t.Fatal(err) t.Fatal(err)
} }
postCommit := time.Now() postCommit := time.Now()
@ -130,6 +134,7 @@ func checkContentStoreWriter(ctx context.Context, t *testing.T, cs content.Store
info := content.Info{ info := content.Info{
Digest: s.digest, Digest: s.digest,
Size: int64(len(s.content)), Size: int64(len(s.content)),
Labels: labels,
} }
if err := checkInfo(ctx, cs, s.digest, info, preCommit, postCommit, preCommit, postCommit); err != nil { if err := checkInfo(ctx, cs, s.digest, info, preCommit, postCommit, preCommit, postCommit); err != nil {
t.Fatalf("Check info failed: %+v", err) t.Fatalf("Check info failed: %+v", err)
@ -264,7 +269,7 @@ func checkUploadStatus(ctx context.Context, t *testing.T, cs content.Store) {
checkStatus(t, w1, expected, d1, preStart, postStart, preUpdate, postUpdate) checkStatus(t, w1, expected, d1, preStart, postStart, preUpdate, postUpdate)
preCommit := time.Now() preCommit := time.Now()
if err := w1.Commit(ctx, 0, ""); err != nil { if err := w1.Commit(ctx, 0, "", content.WithLabels(labels)); err != nil {
t.Fatalf("Commit failed: %+v", err) t.Fatalf("Commit failed: %+v", err)
} }
postCommit := time.Now() postCommit := time.Now()
@ -272,6 +277,7 @@ func checkUploadStatus(ctx context.Context, t *testing.T, cs content.Store) {
info := content.Info{ info := content.Info{
Digest: d1, Digest: d1,
Size: 256, Size: 256,
Labels: labels,
} }
if err := checkInfo(ctx, cs, d1, info, preCommit, postCommit, preCommit, postCommit); err != nil { if err := checkInfo(ctx, cs, d1, info, preCommit, postCommit, preCommit, postCommit); err != nil {
@ -292,9 +298,11 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {
t.Fatalf("Failed to write: %+v", err) t.Fatalf("Failed to write: %+v", err)
} }
rootTime := time.Now().UTC().Format(time.RFC3339)
labels := map[string]string{ labels := map[string]string{
"k1": "v1", "k1": "v1",
"k2": "v2", "k2": "v2",
"containerd.io/gc.root": rootTime,
} }
preCommit := time.Now() preCommit := time.Now()
@ -330,6 +338,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {
info.Labels = map[string]string{ info.Labels = map[string]string{
"k1": "v1", "k1": "v1",
"containerd.io/gc.root": rootTime,
} }
preUpdate = time.Now() preUpdate = time.Now()
if _, err := cs.Update(ctx, info, "labels.k3", "labels.k1"); err != nil { if _, err := cs.Update(ctx, info, "labels.k3", "labels.k1"); err != nil {