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

Use t.TempDir instead of os.MkdirTemp

Browse Source 
Signed-off-by: Shingo Omura <everpeace@gmail.com>
This commit is contained in:
Shingo Omura 2023-04-10 20:58:10 +09:00
parent 5885db62c8
commit 05bb52b273
No known key found for this signature in database
GPG Key ID: C4B9C73F26C783AF
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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),
) )

6
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),
) )