Use t.TempDir instead of os.MkdirTemp

everpeace · thaJeztah · commit 30f5c6a1f26b · 2023-07-14T13:38:39.000+02:00
Signed-off-by: Shingo Omura <everpeace@gmail.com> (cherry picked from commit 05bb52b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go
@@ -1339,11 +1339,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),
 	)

Original file line number	Diff line number	Diff line change
`@@ -1339,11 +1339,7 @@ alice:x:1000:`
`1339`	`1339`	`additional-group-for-alice:x:11111:alice`
`1340`	`1340`	`additional-group-for-root:x:22222:root`
`1341`	`1341`	`
`1342`		`- tempRootDir, err := os.MkdirTemp("", "TestContainerUser-")`
`1343`		`- require.NoError(t, err)`
`1344`		`- if tempRootDir != "" {`
`1345`		`- defer os.RemoveAll(tempRootDir)`
`1346`		`- }`
	`1342`	`+ tempRootDir := t.TempDir()`
`1347`	`1343`	`require.NoError(t,`
`1348`	`1344`	`os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755),`
`1349`	`1345`	`)`