From 05bb52b27397358e091ecebc416606c2a46a10fe Mon Sep 17 00:00:00 2001 From: Shingo Omura Date: Mon, 10 Apr 2023 20:58:10 +0900 Subject: [PATCH] Use t.TempDir instead of os.MkdirTemp Signed-off-by: Shingo Omura --- pkg/cri/sbserver/container_create_linux_test.go | 6 +----- pkg/cri/server/container_create_linux_test.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pkg/cri/sbserver/container_create_linux_test.go b/pkg/cri/sbserver/container_create_linux_test.go index 184e36761..ab41a7012 100644 --- a/pkg/cri/sbserver/container_create_linux_test.go +++ b/pkg/cri/sbserver/container_create_linux_test.go @@ -1346,11 +1346,7 @@ alice:x:1000: additional-group-for-alice:x:11111:alice additional-group-for-root:x:22222:root ` - tempRootDir, err := os.MkdirTemp("", "TestContainerUser-") - require.NoError(t, err) - if tempRootDir != "" { - defer os.RemoveAll(tempRootDir) - } + tempRootDir := t.TempDir() require.NoError(t, os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755), ) diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index 744780672..74a798c0e 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -1526,11 +1526,7 @@ alice:x:1000: additional-group-for-alice:x:11111:alice additional-group-for-root:x:22222:root ` - tempRootDir, err := os.MkdirTemp("", "TestContainerUser-") - require.NoError(t, err) - if tempRootDir != "" { - defer os.RemoveAll(tempRootDir) - } + tempRootDir := t.TempDir() require.NoError(t, os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755), )