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

Merge pull request #8370 from everpeace/follow-up-8136

Browse Source 
Follow Up for #8136
This commit is contained in:
Derek McGowan 2023-04-10 09:42:10 -07:00 committed by GitHub
commit bee8267c75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cri/sbserver/container_create_linux_test.go
View File

@ -1346,11 +1346,7 @@ alice:x:1000:
additional-group-for-alice:x:11111:alice additional-group-for-alice:x:11111:alice
additional-group-for-root:x:22222:root additional-group-for-root:x:22222:root
` `
tempRootDir, err := os.MkdirTemp("", "TestContainerUser-") tempRootDir := t.TempDir()
require.NoError(t, err)
if tempRootDir != "" {
defer os.RemoveAll(tempRootDir)
}
require.NoError(t, require.NoError(t,
os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755), os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755),
) )
@ -1392,6 +1388,7 @@ additional-group-for-root:x:22222:root
expected: runtimespec.User{UID: 0, GID: 0, AdditionalGids: []uint32{0, 22222}}, expected: runtimespec.User{UID: 0, GID: 0, AdditionalGids: []uint32{0, 22222}},
}, },
} { } {
desc := desc
t.Run(desc, func(t *testing.T) { t.Run(desc, func(t *testing.T) {
containerConfig, sandboxConfig, imageConfig, _ := getCreateContainerTestData() containerConfig, sandboxConfig, imageConfig, _ := getCreateContainerTestData()
containerConfig.Linux.SecurityContext = test.securityContext containerConfig.Linux.SecurityContext = test.securityContext

7
pkg/cri/server/container_create_linux_test.go
View File

@ -1526,11 +1526,7 @@ alice:x:1000:
additional-group-for-alice:x:11111:alice additional-group-for-alice:x:11111:alice
additional-group-for-root:x:22222:root additional-group-for-root:x:22222:root
` `
tempRootDir, err := os.MkdirTemp("", "TestContainerUser-") tempRootDir := t.TempDir()
require.NoError(t, err)
if tempRootDir != "" {
defer os.RemoveAll(tempRootDir)
}
require.NoError(t, require.NoError(t,
os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755), os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755),
) )
@ -1572,6 +1568,7 @@ additional-group-for-root:x:22222:root
expected: runtimespec.User{UID: 0, GID: 0, AdditionalGids: []uint32{0, 22222}}, expected: runtimespec.User{UID: 0, GID: 0, AdditionalGids: []uint32{0, 22222}},
}, },
} { } {
desc := desc
t.Run(desc, func(t *testing.T) { t.Run(desc, func(t *testing.T) {
containerConfig, sandboxConfig, imageConfig, _ := getCreateContainerTestData() containerConfig, sandboxConfig, imageConfig, _ := getCreateContainerTestData()
containerConfig.Linux.SecurityContext = test.securityContext containerConfig.Linux.SecurityContext = test.securityContext