Skip to content

Commit 8546997

Browse files
cainydevcainydev
committed
fix(tests): update test signatures for context, extraTags, and EventContext changes
1 parent 45af4fd commit 8546997

13 files changed

Lines changed: 299 additions & 183 deletions

File tree

‎pkg/api/routes_test.go‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ func TestRoutes(t *testing.T) {
267267
},
268268
&mocks.MockedImageStore{
269269

270-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
271-
) {
270+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
272271
return "", "", zerr.ErrRepoNotFound
273272
},
274273
})
@@ -282,8 +281,7 @@ func TestRoutes(t *testing.T) {
282281

283282
&mocks.MockedImageStore{
284283

285-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
286-
) {
284+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
287285
return "", "", zerr.ErrManifestNotFound
288286
},
289287
})
@@ -296,8 +294,7 @@ func TestRoutes(t *testing.T) {
296294
},
297295
&mocks.MockedImageStore{
298296

299-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
300-
) {
297+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
301298
return "", "", zerr.ErrBadManifest
302299
},
303300
})
@@ -310,8 +307,7 @@ func TestRoutes(t *testing.T) {
310307
},
311308
&mocks.MockedImageStore{
312309

313-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
314-
) {
310+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
315311
return "", "", zerr.ErrBlobNotFound
316312
},
317313
})
@@ -325,8 +321,7 @@ func TestRoutes(t *testing.T) {
325321
},
326322
&mocks.MockedImageStore{
327323

328-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
329-
) {
324+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
330325
return "", "", zerr.ErrRepoBadVersion
331326
},
332327
})
@@ -358,9 +353,7 @@ func TestRoutes(t *testing.T) {
358353
digestRef := manifestDigest.String()
359354

360355
ism := &mocks.MockedImageStore{
361-
PutImageManifestFn: func(repo, reference, mediaType string, body []byte, extraTags []string) (
362-
godigest.Digest, godigest.Digest, error,
363-
) {
356+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
364357
So(extraTags, ShouldResemble, []string{"meta-a", "meta-b"})
365358
So(string(body), ShouldEqual, string(mcontent))
366359

‎pkg/extensions/search/search_test.go‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4274,7 +4274,8 @@ func TestGlobalSearch(t *testing.T) { //nolint: gocyclo
42744274

42754275

42764276
indexMultiArchMiddle1Digest, _, err := storeCtlr.GetDefaultImageStore().PutImageManifest(
4277-
context.Background(), repoName, "multiArchMiddle1", ispec.MediaTypeImageIndex, indexMultiArchMiddle1Blob, nil) So(err, ShouldBeNil)
4277+
context.Background(), repoName, "multiArchMiddle1", ispec.MediaTypeImageIndex, indexMultiArchMiddle1Blob, nil)
4278+
So(err, ShouldBeNil)
42784279

42794280
image211 := CreateRandomImage()
42804281
image212 := CreateRandomImage()
@@ -4299,7 +4300,8 @@ func TestGlobalSearch(t *testing.T) { //nolint: gocyclo
42994300

43004301

43014302
indexMultiArchMiddle2Digest, _, err := storeCtlr.GetDefaultImageStore().PutImageManifest(
4302-
context.Background(), repoName, "multiArchMiddle2", ispec.MediaTypeImageIndex, indexMultiArchMiddle2Blob, nil) So(err, ShouldBeNil)
4303+
context.Background(), repoName, "multiArchMiddle2", ispec.MediaTypeImageIndex, indexMultiArchMiddle2Blob, nil)
4304+
So(err, ShouldBeNil)
43034305

43044306
image31 := CreateRandomImage()
43054307
image32 := CreateRandomImage()
@@ -4334,7 +4336,8 @@ func TestGlobalSearch(t *testing.T) { //nolint: gocyclo
43344336

43354337

43364338
_, _, err = storeCtlr.GetDefaultImageStore().PutImageManifest(
4337-
context.Background(), repoName, "multiArchTop", ispec.MediaTypeImageIndex, indexMultiArchTopBlob, nil) So(err, ShouldBeNil)
4339+
context.Background(), repoName, "multiArchTop", ispec.MediaTypeImageIndex, indexMultiArchTopBlob, nil)
4340+
So(err, ShouldBeNil)
43384341

43394342
ctlrManager.StartAndWait(port)
43404343
defer ctlrManager.StopServer()
@@ -4446,7 +4449,8 @@ func TestGlobalSearch(t *testing.T) { //nolint: gocyclo
44464449

44474450

44484451
indexMultiArchMiddle1Digest, _, err := storeCtlr.GetDefaultImageStore().PutImageManifest(
4449-
context.Background(), repoName, "multiArchMiddle1", ispec.MediaTypeImageIndex, indexMultiArchMiddle1Blob, nil) So(err, ShouldBeNil)
4452+
context.Background(), repoName, "multiArchMiddle1", ispec.MediaTypeImageIndex, indexMultiArchMiddle1Blob, nil)
4453+
So(err, ShouldBeNil)
44504454

44514455
image211 := CreateRandomImage()
44524456
image212 := CreateRandomImage()
@@ -4471,7 +4475,8 @@ func TestGlobalSearch(t *testing.T) { //nolint: gocyclo
44714475

44724476

44734477
indexMultiArchMiddle2Digest, _, err := storeCtlr.GetDefaultImageStore().PutImageManifest(
4474-
context.Background(), repoName, "multiArchMiddle2", ispec.MediaTypeImageIndex, indexMultiArchMiddle2Blob, nil) So(err, ShouldBeNil)
4478+
context.Background(), repoName, "multiArchMiddle2", ispec.MediaTypeImageIndex, indexMultiArchMiddle2Blob, nil)
4479+
So(err, ShouldBeNil)
44754480

44764481
image31 := CreateRandomImage()
44774482
image32 := CreateRandomImage()
@@ -4506,7 +4511,8 @@ func TestGlobalSearch(t *testing.T) { //nolint: gocyclo
45064511

45074512

45084513
_, _, err = storeCtlr.GetDefaultImageStore().PutImageManifest(
4509-
context.Background(), repoName, "multiArchTop", ispec.MediaTypeImageIndex, indexMultiArchTopBlob, nil) So(err, ShouldBeNil)
4514+
context.Background(), repoName, "multiArchTop", ispec.MediaTypeImageIndex, indexMultiArchTopBlob, nil)
4515+
So(err, ShouldBeNil)
45104516

45114517
ctlr := api.NewController(conf)
45124518

@@ -5232,8 +5238,7 @@ func TestMetaDBWhenSigningImages(t *testing.T) {
52325238
// make image store ignore the wrong format of the input
52335239
ctlr.StoreController.DefaultStore = mocks.MockedImageStore{
52345240

5235-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
5236-
) {
5241+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
52375242
return "", "", nil
52385243
},
52395244
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, dc bool) error {
@@ -6629,8 +6634,7 @@ func TestMetaDBWhenDeletingImages(t *testing.T) {
66296634
Convey("imageIsSignature fails", func() {
66306635
ctlr.StoreController.DefaultStore = mocks.MockedImageStore{
66316636

6632-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
6633-
) {
6637+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
66346638
return "", "", nil
66356639
},
66366640
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, dc bool) error {
@@ -6655,8 +6659,7 @@ func TestMetaDBWhenDeletingImages(t *testing.T) {
66556659
return configBlob, nil
66566660
},
66576661

6658-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
6659-
) {
6662+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
66606663
return "", "", nil
66616664
},
66626665
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, dc bool) error {
@@ -6685,8 +6688,7 @@ func TestMetaDBWhenDeletingImages(t *testing.T) {
66856688
return configBlob, nil
66866689
},
66876690

6688-
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte) (godigest.Digest, godigest.Digest, error,
6689-
) {
6691+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
66906692
return "", "", ErrTestError
66916693
},
66926694
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, dc bool) error {

‎pkg/extensions/sync/sync_internal_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,8 @@ func TestDestinationRegistry(t *testing.T) {
866866
So(digest, ShouldNotBeNil)
867867

868868
_, _, err = imgStore.PutImageManifest(
869-
context.Background(), repoName, digest.String(), ispec.MediaTypeImageManifest, content, nil) So(err, ShouldBeNil)
869+
context.Background(), repoName, digest.String(), ispec.MediaTypeImageManifest, content, nil)
870+
So(err, ShouldBeNil)
870871

871872
index.Manifests = append(index.Manifests, ispec.Descriptor{
872873
Digest: digest,
@@ -882,7 +883,8 @@ func TestDestinationRegistry(t *testing.T) {
882883
So(indexDigest, ShouldNotBeNil)
883884

884885

885-
_, _, err = imgStore.PutImageManifest(context.Background(), repoName, "1.0", ispec.MediaTypeImageIndex, indexContent, nil) So(err, ShouldBeNil)
886+
_, _, err = imgStore.PutImageManifest(context.Background(), repoName, "1.0", ispec.MediaTypeImageIndex, indexContent, nil)
887+
So(err, ShouldBeNil)
886888

887889
Convey("sync index image", func() {
888890
ok, err := registry.CanSkipImage(repoName, "1.0", indexDigest)
@@ -1070,7 +1072,8 @@ func TestDestinationRegistry(t *testing.T) {
10701072
// Store the manifest in the temp image store
10711073

10721074
_, _, err = tempImgStore.PutImageManifest(
1073-
context.Background(), repoName, manifestDigest.String(), ispec.MediaTypeImageManifest, manifestContent, nil) So(err, ShouldBeNil)
1075+
context.Background(), repoName, manifestDigest.String(), ispec.MediaTypeImageManifest, manifestContent, nil)
1076+
So(err, ShouldBeNil)
10741077

10751078
// Add to index
10761079
index.Manifests = append(index.Manifests, ispec.Descriptor{
@@ -1089,7 +1092,8 @@ func TestDestinationRegistry(t *testing.T) {
10891092
// Store the index manifest in the temp image store
10901093

10911094
_, _, err = tempImgStore.PutImageManifest(
1092-
context.Background(), repoName, indexDigest.String(), ispec.MediaTypeImageIndex, indexContent, nil) So(err, ShouldBeNil)
1095+
context.Background(), repoName, indexDigest.String(), ispec.MediaTypeImageIndex, indexContent, nil)
1096+
So(err, ShouldBeNil)
10931097

10941098
// Now remove one of the child manifest blobs to trigger the error
10951099
childManifestDigest := index.Manifests[1].Digest
@@ -1182,7 +1186,8 @@ func TestDestinationRegistry(t *testing.T) {
11821186
So(digest, ShouldNotBeNil)
11831187

11841188

1185-
_, _, err = imgStore.PutImageManifest(context.Background(), repoName, "2.0", ispec.MediaTypeImageManifest, content, nil) So(err, ShouldBeNil)
1189+
_, _, err = imgStore.PutImageManifest(context.Background(), repoName, "2.0", ispec.MediaTypeImageManifest, content, nil)
1190+
So(err, ShouldBeNil)
11861191

11871192
Convey("sync image", func() {
11881193
ok, err := registry.CanSkipImage(repoName, "2.0", digest)

‎pkg/meta/hooks_internal_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func TestRollbackDigestManifestTags(t *testing.T) {
129129
var deleteCalls int
130130

131131
is := mocks.MockedImageStore{
132-
DeleteImageManifestFn: func(repo, reference string, detectCollision bool) error {
132+
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, detectCollision bool) error {
133133
deleteCalls++
134134

135135
return errors.New("delete failed")
@@ -145,7 +145,7 @@ func TestRollbackDigestManifestTags(t *testing.T) {
145145

146146
Convey("delete manifest not found is ignored", func() {
147147
is := mocks.MockedImageStore{
148-
DeleteImageManifestFn: func(repo, reference string, detectCollision bool) error {
148+
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, detectCollision bool) error {
149149
return zerr.ErrManifestNotFound
150150
},
151151
}
@@ -177,7 +177,7 @@ func TestRollbackDigestManifestTags(t *testing.T) {
177177
}
178178

179179
is := mocks.MockedImageStore{
180-
DeleteImageManifestFn: func(string, string, bool) error { return nil },
180+
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, detectCollision bool) error { return nil },
181181
GetBlobContentFn: func(string, godigest.Digest) ([]byte, error) {
182182
return nil, errors.New("blob missing")
183183
},
@@ -196,13 +196,13 @@ func TestRollbackDigestManifestTags(t *testing.T) {
196196
}
197197

198198
is := mocks.MockedImageStore{
199-
DeleteImageManifestFn: func(string, string, bool) error { return nil },
199+
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, detectCollision bool) error { return nil },
200200
GetBlobContentFn: func(_ string, blobDigest godigest.Digest) ([]byte, error) {
201201
So(blobDigest, ShouldResemble, priorD)
202202

203203
return priorBody, nil
204204
},
205-
PutImageManifestFn: func(string, string, string, []byte, []string) (godigest.Digest, godigest.Digest, error) {
205+
PutImageManifestFn: func(ctx context.Context, repo, reference, mediaType string, body []byte, extraTags []string) (godigest.Digest, godigest.Digest, error) {
206206
return "", "", errors.New("put failed")
207207
},
208208
}
@@ -233,7 +233,7 @@ func TestRollbackDigestManifestTags(t *testing.T) {
233233
}
234234

235235
is := mocks.MockedImageStore{
236-
DeleteImageManifestFn: func(string, string, bool) error { return nil },
236+
DeleteImageManifestFn: func(ctx context.Context, repo, reference string, detectCollision bool) error { return nil },
237237
GetBlobContentFn: func(_ string, blobDigest godigest.Digest) ([]byte, error) {
238238
switch {
239239
case blobDigest == priorD:
@@ -247,7 +247,7 @@ func TestRollbackDigestManifestTags(t *testing.T) {
247247

248248
return nil, nil
249249
},
250-
PutImageManifestFn: func(_, _, _ string, blob []byte, _ []string) (godigest.Digest, godigest.Digest, error) {
250+
PutImageManifestFn: func(ctx context.Context, _, _, _ string, blob []byte, _ []string) (godigest.Digest, godigest.Digest, error) {
251251
d := godigest.FromBytes(blob)
252252

253253
return d, d, nil

‎pkg/meta/hooks_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ type failDeleteImageStore struct {
5454
deleteErr error
5555
}
5656

57-
func (f *failDeleteImageStore) DeleteImageManifest(repo, reference string, detectCollision bool) error {
57+
func (f *failDeleteImageStore) DeleteImageManifest(ctx context.Context, repo, reference string, detectCollision bool) error {
5858
return f.deleteErr
5959
}
6060

@@ -103,7 +103,7 @@ func TestOnUpdateManifestDigestTags_success(t *testing.T) {
103103
So(err, ShouldBeNil)
104104

105105
imgStore := storeController.GetImageStore("repo")
106-
_, _, err = imgStore.PutImageManifest("repo", manifestDigest.String(), mediaType, manifestBody,
106+
_, _, err = imgStore.PutImageManifest(context.Background(), "repo", manifestDigest.String(), mediaType, manifestBody,
107107
[]string{"ta", "tb"})
108108
So(err, ShouldBeNil)
109109

@@ -159,7 +159,7 @@ func TestOnUpdateManifestDigestTags_rollbackPartialMeta(t *testing.T) {
159159
So(err, ShouldBeNil)
160160

161161
imgStore := storeController.GetImageStore("repo")
162-
_, _, err = imgStore.PutImageManifest("repo", manifestDigest.String(), mediaType, manifestBody,
162+
_, _, err = imgStore.PutImageManifest(context.Background(), "repo", manifestDigest.String(), mediaType, manifestBody,
163163
[]string{"ta", "tb"})
164164
So(err, ShouldBeNil)
165165

@@ -245,7 +245,7 @@ func TestOnUpdateManifestDigestTags_rollbackRestoresMovedTag(t *testing.T) {
245245

246246
imgStore := storeController.GetImageStore("repo")
247247

248-
_, _, err = imgStore.PutImageManifest("repo", digestB.String(), mediaTypeB, bodyB,
248+
_, _, err = imgStore.PutImageManifest(context.Background(), "repo", digestB.String(), mediaTypeB, bodyB,
249249
[]string{"movable", "onlyB"})
250250
So(err, ShouldBeNil)
251251

@@ -321,7 +321,7 @@ func TestOnUpdateManifestDigestTags_whenRepoMetaMissing(t *testing.T) {
321321
So(errors.Is(err, zerr.ErrRepoMetaNotFound), ShouldBeTrue)
322322

323323
imgStore := storeController.GetImageStore("repo")
324-
_, _, err = imgStore.PutImageManifest("repo", manifestDigest.String(), mediaType, manifestBody,
324+
_, _, err = imgStore.PutImageManifest(context.Background(), "repo", manifestDigest.String(), mediaType, manifestBody,
325325
[]string{"ta", "tb"})
326326
So(err, ShouldBeNil)
327327

‎pkg/storage/common/common_test.go‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,22 @@ func TestValidateManifest(t *testing.T) {
6161
So(err, ShouldBeNil)
6262

6363

64-
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageConfig, body, nil) So(err, ShouldNotBeNil)
64+
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageConfig, body, nil)
65+
So(err, ShouldNotBeNil)
6566
So(err, ShouldEqual, zerr.ErrBadManifest)
6667
})
6768

6869
Convey("empty manifest with bad media type", func() {
6970

70-
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageConfig, []byte(""), nil) So(err, ShouldNotBeNil)
71+
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageConfig, []byte(""), nil)
72+
So(err, ShouldNotBeNil)
7173
So(err, ShouldEqual, zerr.ErrBadManifest)
7274
})
7375

7476
Convey("empty manifest with correct media type", func() {
7577

76-
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, []byte(""), nil) So(err, ShouldNotBeNil)
78+
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, []byte(""), nil)
79+
So(err, ShouldNotBeNil)
7780
So(err, ShouldEqual, zerr.ErrBadManifest)
7881
})
7982

@@ -99,7 +102,8 @@ func TestValidateManifest(t *testing.T) {
99102
So(err, ShouldBeNil)
100103

101104

102-
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil) So(err, ShouldNotBeNil)
105+
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil)
106+
So(err, ShouldNotBeNil)
103107

104108
var internalErr *zerr.Error
105109

@@ -136,7 +140,8 @@ func TestValidateManifest(t *testing.T) {
136140

137141
// this was actually an umoci error on config blob
138142

139-
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil) So(err, ShouldBeNil)
143+
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil)
144+
So(err, ShouldBeNil)
140145
})
141146

142147
Convey("manifest with non-distributable layers", func() {
@@ -165,7 +170,8 @@ func TestValidateManifest(t *testing.T) {
165170
So(err, ShouldBeNil)
166171

167172

168-
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil) So(err, ShouldBeNil)
173+
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil)
174+
So(err, ShouldBeNil)
169175
})
170176

171177
Convey("manifest with empty layers should not error", func() {
@@ -184,7 +190,8 @@ func TestValidateManifest(t *testing.T) {
184190
So(err, ShouldBeNil)
185191

186192

187-
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil) So(err, ShouldBeNil)
193+
_, _, err = imgStore.PutImageManifest(context.Background(), "test", "1.0", ispec.MediaTypeImageManifest, body, nil)
194+
So(err, ShouldBeNil)
188195
})
189196
})
190197
}

0 commit comments

Comments
 (0)