0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46652 from laurazard/fix-test-import-custom-image-custom-plat

Browse source 
c8d integration: skip TestImportWithCustomPlatform
This commit is contained in:
Sebastiaan van Stijn 2023-10-17 13:56:57 +02:00 • committed by GitHub
commit b85185e659
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
integration/image/import_test.go
View file

@ -67,10 +67,9 @@ func TestImportWithCustomPlatform(t *testing.T) {
imageRdr := io.MultiReader(&tarBuffer, io.LimitReader(testutil.DevZero, 0))
tests := []struct {
name string
platform string
expected image.V1Image
expectedErr string
name string
platform string
expected image.V1Image
}{
{
platform: "",
@ -79,14 +78,6 @@ func TestImportWithCustomPlatform(t *testing.T) {
Architecture: runtime.GOARCH, // this may fail on armhf due to normalization?
},
},
{
platform: " ",
expectedErr: "is an invalid component",
},
{
platform: "/",
expectedErr: "is an invalid component",
},
{
platform: runtime.GOOS,
expected: image.V1Image{
@ -108,6 +99,58 @@ func TestImportWithCustomPlatform(t *testing.T) {
Architecture: "sparc64",
},
},
}
for i, tc := range tests {
tc := tc
t.Run(tc.platform, func(t *testing.T) {
ctx := testutil.StartSpan(ctx, t)
reference := "import-with-platform:tc-" + strconv.Itoa(i)
_, err = client.ImageImport(ctx,
types.ImageImportSource{Source: imageRdr, SourceName: "-"},
reference,
types.ImageImportOptions{Platform: tc.platform})
assert.NilError(t, err)
inspect, _, err := client.ImageInspectWithRaw(ctx, reference)
assert.NilError(t, err)
assert.Equal(t, inspect.Os, tc.expected.OS)
assert.Equal(t, inspect.Architecture, tc.expected.Architecture)
})
}
}
func TestImportWithCustomPlatformReject(t *testing.T) {
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "TODO enable on windows")
skip.If(t, testEnv.UsingSnapshotter(), "we support importing images/other platforms w/ containerd image store")
ctx := setupTest(t)
client := testEnv.APIClient()
// Construct an empty tar archive.
var tarBuffer bytes.Buffer
tw := tar.NewWriter(&tarBuffer)
err := tw.Close()
assert.NilError(t, err)
imageRdr := io.MultiReader(&tarBuffer, io.LimitReader(testutil.DevZero, 0))
tests := []struct {
name string
platform string
expected image.V1Image
expectedErr string
}{
{
platform: " ",
expectedErr: "is an invalid component",
},
{
platform: "/",
expectedErr: "is an invalid component",
},
{
platform: "macos",
expectedErr: "operating system is not supported",
@ -134,16 +177,8 @@ func TestImportWithCustomPlatform(t *testing.T) {
types.ImageImportSource{Source: imageRdr, SourceName: "-"},
reference,
types.ImageImportOptions{Platform: tc.platform})
if tc.expectedErr != "" {
assert.ErrorContains(t, err, tc.expectedErr)
} else {
assert.NilError(t, err)
inspect, _, err := client.ImageInspectWithRaw(ctx, reference)
assert.NilError(t, err)
assert.Equal(t, inspect.Os, tc.expected.OS)
assert.Equal(t, inspect.Architecture, tc.expected.Architecture)
}
assert.ErrorContains(t, err, tc.expectedErr)
})
}
}