Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

Commit

Permalink
chore: fix testcase
Browse files Browse the repository at this point in the history
  • Loading branch information
MaineK00n committed Sep 19, 2021
1 parent 45bd418 commit 866e943
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 50 deletions.
86 changes: 43 additions & 43 deletions artifact/image/image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ func TestArtifact_Inspect(t *testing.T) {
missingBlobsExpectation: cache.ArtifactCacheMissingBlobsExpectation{
Args: cache.ArtifactCacheMissingBlobsArgs{
ArtifactID: "sha256:59c4082ceb491faefd44cf9a006dd24c8f57b44b438f081251c90ea1367ca043",
BlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
BlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
},
Returns: cache.ArtifactCacheMissingBlobsReturns{
MissingArtifact: true,
MissingBlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
MissingBlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
},
},
putBlobExpectations: []cache.ArtifactCachePutBlobExpectation{
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29",
BlobID: "sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand Down Expand Up @@ -105,7 +105,7 @@ func TestArtifact_Inspect(t *testing.T) {
Name: "../../test/testdata/alpine-311.tar.gz",
Type: types.ArtifactContainerImage,
ID: "sha256:59c4082ceb491faefd44cf9a006dd24c8f57b44b438f081251c90ea1367ca043",
BlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
BlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
ImageMetadata: types.ImageMetadata{
ID: "sha256:a187dde48cd289ac374ad8539930628314bc581a481cdb41409c9289419ddb72",
DiffIDs: []string{
Expand Down Expand Up @@ -152,25 +152,25 @@ func TestArtifact_Inspect(t *testing.T) {
Args: cache.ArtifactCacheMissingBlobsArgs{
ArtifactID: "sha256:b79b48d9023d85be348e989163bb5f78bf9d0a9e6004a656dba50841ff212693",
BlobIDs: []string{
"sha256:0203a9d8a0a2ee515ae3d9d211372316791654f6d4b7f9f00a3c0906be054e93",
"sha256:02af4fbed4ea7e8021770ab6846c6183e763b45b0adb0215ef2377689d2d501b",
"sha256:ee974db343198546d609c78a705989ab295c06475d0ff0fd392f2a4970f040de",
"sha256:7ca1744c7455a336ec8c430c8f0e3091f6fac3b2130ce9a40f88e7c0becf47e6",
"sha256:270da54dcdd8b9e4a0025a2d112573a9708825a84501ee60468e35dc80d6d632",
"sha256:e770d2218dad799ec712a4aee017238777674d1993ac24ea62f38ba1dfdac9e7",
"sha256:099dacfe55e8f86cf1758aeae351bde13b301f5b1e70aa07d67aac956332f739",
"sha256:0ca5319601aae694c9cdba4c90a00f26e5e2ec0f2831d850fb5b667cafb52e8b",
},
},
Returns: cache.ArtifactCacheMissingBlobsReturns{
MissingBlobIDs: []string{
"sha256:0203a9d8a0a2ee515ae3d9d211372316791654f6d4b7f9f00a3c0906be054e93",
"sha256:02af4fbed4ea7e8021770ab6846c6183e763b45b0adb0215ef2377689d2d501b",
"sha256:ee974db343198546d609c78a705989ab295c06475d0ff0fd392f2a4970f040de",
"sha256:7ca1744c7455a336ec8c430c8f0e3091f6fac3b2130ce9a40f88e7c0becf47e6",
"sha256:270da54dcdd8b9e4a0025a2d112573a9708825a84501ee60468e35dc80d6d632",
"sha256:e770d2218dad799ec712a4aee017238777674d1993ac24ea62f38ba1dfdac9e7",
"sha256:099dacfe55e8f86cf1758aeae351bde13b301f5b1e70aa07d67aac956332f739",
"sha256:0ca5319601aae694c9cdba4c90a00f26e5e2ec0f2831d850fb5b667cafb52e8b",
},
},
},
putBlobExpectations: []cache.ArtifactCachePutBlobExpectation{
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:0203a9d8a0a2ee515ae3d9d211372316791654f6d4b7f9f00a3c0906be054e93",
BlobID: "sha256:270da54dcdd8b9e4a0025a2d112573a9708825a84501ee60468e35dc80d6d632",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand Down Expand Up @@ -204,7 +204,7 @@ func TestArtifact_Inspect(t *testing.T) {
},
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:02af4fbed4ea7e8021770ab6846c6183e763b45b0adb0215ef2377689d2d501b",
BlobID: "sha256:e770d2218dad799ec712a4aee017238777674d1993ac24ea62f38ba1dfdac9e7",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand Down Expand Up @@ -234,7 +234,7 @@ func TestArtifact_Inspect(t *testing.T) {
},
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:ee974db343198546d609c78a705989ab295c06475d0ff0fd392f2a4970f040de",
BlobID: "sha256:099dacfe55e8f86cf1758aeae351bde13b301f5b1e70aa07d67aac956332f739",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand Down Expand Up @@ -264,7 +264,7 @@ func TestArtifact_Inspect(t *testing.T) {
{
// Gemfile.lock will not be scanned.
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:7ca1744c7455a336ec8c430c8f0e3091f6fac3b2130ce9a40f88e7c0becf47e6",
BlobID: "sha256:0ca5319601aae694c9cdba4c90a00f26e5e2ec0f2831d850fb5b667cafb52e8b",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand All @@ -279,10 +279,10 @@ func TestArtifact_Inspect(t *testing.T) {
Type: types.ArtifactContainerImage,
ID: "sha256:b79b48d9023d85be348e989163bb5f78bf9d0a9e6004a656dba50841ff212693",
BlobIDs: []string{
"sha256:0203a9d8a0a2ee515ae3d9d211372316791654f6d4b7f9f00a3c0906be054e93",
"sha256:02af4fbed4ea7e8021770ab6846c6183e763b45b0adb0215ef2377689d2d501b",
"sha256:ee974db343198546d609c78a705989ab295c06475d0ff0fd392f2a4970f040de",
"sha256:7ca1744c7455a336ec8c430c8f0e3091f6fac3b2130ce9a40f88e7c0becf47e6",
"sha256:270da54dcdd8b9e4a0025a2d112573a9708825a84501ee60468e35dc80d6d632",
"sha256:e770d2218dad799ec712a4aee017238777674d1993ac24ea62f38ba1dfdac9e7",
"sha256:099dacfe55e8f86cf1758aeae351bde13b301f5b1e70aa07d67aac956332f739",
"sha256:0ca5319601aae694c9cdba4c90a00f26e5e2ec0f2831d850fb5b667cafb52e8b",
},
ImageMetadata: types.ImageMetadata{
ID: "sha256:58701fd185bda36cab0557bb6438661831267aa4a9e0b54211c4d5317a48aff4",
Expand Down Expand Up @@ -360,25 +360,25 @@ func TestArtifact_Inspect(t *testing.T) {
Args: cache.ArtifactCacheMissingBlobsArgs{
ArtifactID: "sha256:b79b48d9023d85be348e989163bb5f78bf9d0a9e6004a656dba50841ff212693",
BlobIDs: []string{
"sha256:f964ce5cb9cb1721515e117ce12e9166e71a251f58c34b4752ffe19b9bf7846e",
"sha256:9629d21a44aafadb938fe26a48d9eb75a92a590f43d38ade3da44c965472dc39",
"sha256:9811da603662e8806d723b2bafc1fcbae8292596f3ed78a49abfed7da0c26559",
"sha256:5437593858561686d969e14d2fa4b7badf3a7d82f4cd688d0c067b94b505f131",
"sha256:fd9d36dfa5f8f418a9005e47b7e464258d95f700fd75c58e34d9ef5724a0556e",
"sha256:4fd24711eb1e17ab72923fc2d4cbea9d0a3a4253f617408344d6b352cc0d84e0",
"sha256:f32683880d66f8fdb2e6de41fbdab4c29690540e7b1ad405e964ef7895b322d1",
"sha256:341ca8d2b47ac218db83ef1d13d2e1365b25b7f44f7b7a989906700ed0dfddf0",
},
},
Returns: cache.ArtifactCacheMissingBlobsReturns{
MissingBlobIDs: []string{
"sha256:f964ce5cb9cb1721515e117ce12e9166e71a251f58c34b4752ffe19b9bf7846e",
"sha256:9629d21a44aafadb938fe26a48d9eb75a92a590f43d38ade3da44c965472dc39",
"sha256:9811da603662e8806d723b2bafc1fcbae8292596f3ed78a49abfed7da0c26559",
"sha256:5437593858561686d969e14d2fa4b7badf3a7d82f4cd688d0c067b94b505f131",
"sha256:fd9d36dfa5f8f418a9005e47b7e464258d95f700fd75c58e34d9ef5724a0556e",
"sha256:4fd24711eb1e17ab72923fc2d4cbea9d0a3a4253f617408344d6b352cc0d84e0",
"sha256:f32683880d66f8fdb2e6de41fbdab4c29690540e7b1ad405e964ef7895b322d1",
"sha256:341ca8d2b47ac218db83ef1d13d2e1365b25b7f44f7b7a989906700ed0dfddf0",
},
},
},
putBlobExpectations: []cache.ArtifactCachePutBlobExpectation{
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:f964ce5cb9cb1721515e117ce12e9166e71a251f58c34b4752ffe19b9bf7846e",
BlobID: "sha256:fd9d36dfa5f8f418a9005e47b7e464258d95f700fd75c58e34d9ef5724a0556e",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand All @@ -388,7 +388,7 @@ func TestArtifact_Inspect(t *testing.T) {
},
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:9629d21a44aafadb938fe26a48d9eb75a92a590f43d38ade3da44c965472dc39",
BlobID: "sha256:4fd24711eb1e17ab72923fc2d4cbea9d0a3a4253f617408344d6b352cc0d84e0",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand All @@ -398,7 +398,7 @@ func TestArtifact_Inspect(t *testing.T) {
},
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:9811da603662e8806d723b2bafc1fcbae8292596f3ed78a49abfed7da0c26559",
BlobID: "sha256:f32683880d66f8fdb2e6de41fbdab4c29690540e7b1ad405e964ef7895b322d1",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand All @@ -409,7 +409,7 @@ func TestArtifact_Inspect(t *testing.T) {
},
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:5437593858561686d969e14d2fa4b7badf3a7d82f4cd688d0c067b94b505f131",
BlobID: "sha256:341ca8d2b47ac218db83ef1d13d2e1365b25b7f44f7b7a989906700ed0dfddf0",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand All @@ -424,10 +424,10 @@ func TestArtifact_Inspect(t *testing.T) {
Type: types.ArtifactContainerImage,
ID: "sha256:b79b48d9023d85be348e989163bb5f78bf9d0a9e6004a656dba50841ff212693",
BlobIDs: []string{
"sha256:f964ce5cb9cb1721515e117ce12e9166e71a251f58c34b4752ffe19b9bf7846e",
"sha256:9629d21a44aafadb938fe26a48d9eb75a92a590f43d38ade3da44c965472dc39",
"sha256:9811da603662e8806d723b2bafc1fcbae8292596f3ed78a49abfed7da0c26559",
"sha256:5437593858561686d969e14d2fa4b7badf3a7d82f4cd688d0c067b94b505f131",
"sha256:fd9d36dfa5f8f418a9005e47b7e464258d95f700fd75c58e34d9ef5724a0556e",
"sha256:4fd24711eb1e17ab72923fc2d4cbea9d0a3a4253f617408344d6b352cc0d84e0",
"sha256:f32683880d66f8fdb2e6de41fbdab4c29690540e7b1ad405e964ef7895b322d1",
"sha256:341ca8d2b47ac218db83ef1d13d2e1365b25b7f44f7b7a989906700ed0dfddf0",
},
ImageMetadata: types.ImageMetadata{
ID: "sha256:58701fd185bda36cab0557bb6438661831267aa4a9e0b54211c4d5317a48aff4",
Expand Down Expand Up @@ -493,7 +493,7 @@ func TestArtifact_Inspect(t *testing.T) {
missingBlobsExpectation: cache.ArtifactCacheMissingBlobsExpectation{
Args: cache.ArtifactCacheMissingBlobsArgs{
ArtifactID: "sha256:59c4082ceb491faefd44cf9a006dd24c8f57b44b438f081251c90ea1367ca043",
BlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
BlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
},
Returns: cache.ArtifactCacheMissingBlobsReturns{
Err: xerrors.New("MissingBlobs failed"),
Expand All @@ -507,16 +507,16 @@ func TestArtifact_Inspect(t *testing.T) {
missingBlobsExpectation: cache.ArtifactCacheMissingBlobsExpectation{
Args: cache.ArtifactCacheMissingBlobsArgs{
ArtifactID: "sha256:59c4082ceb491faefd44cf9a006dd24c8f57b44b438f081251c90ea1367ca043",
BlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
BlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
},
Returns: cache.ArtifactCacheMissingBlobsReturns{
MissingBlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
MissingBlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
},
},
putBlobExpectations: []cache.ArtifactCachePutBlobExpectation{
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29",
BlobID: "sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand Down Expand Up @@ -562,17 +562,17 @@ func TestArtifact_Inspect(t *testing.T) {
missingBlobsExpectation: cache.ArtifactCacheMissingBlobsExpectation{
Args: cache.ArtifactCacheMissingBlobsArgs{
ArtifactID: "sha256:59c4082ceb491faefd44cf9a006dd24c8f57b44b438f081251c90ea1367ca043",
BlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
BlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
},
Returns: cache.ArtifactCacheMissingBlobsReturns{
MissingArtifact: true,
MissingBlobIDs: []string{"sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29"},
MissingBlobIDs: []string{"sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0"},
},
},
putBlobExpectations: []cache.ArtifactCachePutBlobExpectation{
{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:609d3e92df961c3a66d0bdb61f07946aac7614489ef96d6dee7c2e833fbc5f29",
BlobID: "sha256:3b8a4b5c205cdcf58bf9c430917ab79f8b2639a47b183814f8fbc9fa78c268d0",
BlobInfo: types.BlobInfo{
SchemaVersion: 1,
Digest: "",
Expand Down
14 changes: 7 additions & 7 deletions artifact/local/fs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestArtifact_Inspect(t *testing.T) {
},
putBlobExpectation: cache.ArtifactCachePutBlobExpectation{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:b452b832b5b35485b18fc7d80baacfd4fc812cd3b07d7d02727330f7076a999c",
BlobID: "sha256:7a65fdebc0a2048ed6d65b050767a3d478b413c57653a723ee4bd3d4af343096",
BlobInfo: types.BlobInfo{
SchemaVersion: types.BlobJSONSchemaVersion,
DiffID: "sha256:0f88c2f4a441514ebd105e81527af76af15bed17d91c17ba3637397f8c4f1925",
Expand All @@ -61,9 +61,9 @@ func TestArtifact_Inspect(t *testing.T) {
want: types.ArtifactReference{
Name: "host",
Type: types.ArtifactFilesystem,
ID: "sha256:b452b832b5b35485b18fc7d80baacfd4fc812cd3b07d7d02727330f7076a999c",
ID: "sha256:7a65fdebc0a2048ed6d65b050767a3d478b413c57653a723ee4bd3d4af343096",
BlobIDs: []string{
"sha256:b452b832b5b35485b18fc7d80baacfd4fc812cd3b07d7d02727330f7076a999c",
"sha256:7a65fdebc0a2048ed6d65b050767a3d478b413c57653a723ee4bd3d4af343096",
},
},
},
Expand All @@ -75,7 +75,7 @@ func TestArtifact_Inspect(t *testing.T) {
disabledAnalyzers: []analyzer.Type{analyzer.TypeAlpine, analyzer.TypeApk},
putBlobExpectation: cache.ArtifactCachePutBlobExpectation{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:0c144e61b3867b1b6ef5d58620f08e9434fbd30e731094e92feb25060dee03b4",
BlobID: "sha256:e429cf0f9a1fcefe6cc70bbdfe113246a115ec74ea9179df858a072f46794f17",
BlobInfo: types.BlobInfo{
SchemaVersion: types.BlobJSONSchemaVersion,
DiffID: "sha256:3404e98968ad338dc60ef74c0dd5bdd893478415cd2296b0c265a5650b3ae4d6",
Expand All @@ -86,9 +86,9 @@ func TestArtifact_Inspect(t *testing.T) {
want: types.ArtifactReference{
Name: "host",
Type: types.ArtifactFilesystem,
ID: "sha256:0c144e61b3867b1b6ef5d58620f08e9434fbd30e731094e92feb25060dee03b4",
ID: "sha256:e429cf0f9a1fcefe6cc70bbdfe113246a115ec74ea9179df858a072f46794f17",
BlobIDs: []string{
"sha256:0c144e61b3867b1b6ef5d58620f08e9434fbd30e731094e92feb25060dee03b4",
"sha256:e429cf0f9a1fcefe6cc70bbdfe113246a115ec74ea9179df858a072f46794f17",
},
},
},
Expand All @@ -99,7 +99,7 @@ func TestArtifact_Inspect(t *testing.T) {
},
putBlobExpectation: cache.ArtifactCachePutBlobExpectation{
Args: cache.ArtifactCachePutBlobArgs{
BlobID: "sha256:b452b832b5b35485b18fc7d80baacfd4fc812cd3b07d7d02727330f7076a999c",
BlobID: "sha256:7a65fdebc0a2048ed6d65b050767a3d478b413c57653a723ee4bd3d4af343096",
BlobInfo: types.BlobInfo{
SchemaVersion: types.BlobJSONSchemaVersion,
DiffID: "sha256:0f88c2f4a441514ebd105e81527af76af15bed17d91c17ba3637397f8c4f1925",
Expand Down

0 comments on commit 866e943

Please sign in to comment.