From 05bb52b27397358e091ecebc416606c2a46a10fe Mon Sep 17 00:00:00 2001 From: Shingo Omura Date: Mon, 10 Apr 2023 20:58:10 +0900 Subject: [PATCH 1/2] 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), ) From dc2fc987cad542a0fb96b9fc8bb5fed77542b8b4 Mon Sep 17 00:00:00 2001 From: Shingo Omura Date: Mon, 10 Apr 2023 20:58:48 +0900 Subject: [PATCH 2/2] capture desc variable in range variable just in case that it run in parallel mode Signed-off-by: Shingo Omura --- pkg/cri/sbserver/container_create_linux_test.go | 1 + pkg/cri/server/container_create_linux_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/cri/sbserver/container_create_linux_test.go b/pkg/cri/sbserver/container_create_linux_test.go index ab41a7012..01b7f5611 100644 --- a/pkg/cri/sbserver/container_create_linux_test.go +++ b/pkg/cri/sbserver/container_create_linux_test.go @@ -1388,6 +1388,7 @@ additional-group-for-root:x:22222:root expected: runtimespec.User{UID: 0, GID: 0, AdditionalGids: []uint32{0, 22222}}, }, } { + desc := desc t.Run(desc, func(t *testing.T) { containerConfig, sandboxConfig, imageConfig, _ := getCreateContainerTestData() containerConfig.Linux.SecurityContext = test.securityContext diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index 74a798c0e..e0a7ea998 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -1568,6 +1568,7 @@ additional-group-for-root:x:22222:root expected: runtimespec.User{UID: 0, GID: 0, AdditionalGids: []uint32{0, 22222}}, }, } { + desc := desc t.Run(desc, func(t *testing.T) { containerConfig, sandboxConfig, imageConfig, _ := getCreateContainerTestData() containerConfig.Linux.SecurityContext = test.securityContext