Use t.TempDir instead of os.MkdirTemp

everpeace · everpeace · commit 05bb52b27397 · 2023-04-10T20:58:36.000+09:00
Signed-off-by: Shingo Omura &lt;everpeace@gmail.com&gt;
diff --git 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
@@ -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),
 	)

Original file line number	Diff line number	Diff line change
`@@ -1346,11 +1346,7 @@ alice:x:1000:`
`1346`	`1346`	`additional-group-for-alice:x:11111:alice`
`1347`	`1347`	`additional-group-for-root:x:22222:root`
`1348`	`1348`	`
`1349`		`- tempRootDir, err := os.MkdirTemp("", "TestContainerUser-")`
`1350`		`- require.NoError(t, err)`
`1351`		`- if tempRootDir != "" {`
`1352`		`- defer os.RemoveAll(tempRootDir)`
`1353`		`- }`
	`1349`	`+ tempRootDir := t.TempDir()`
`1354`	`1350`	`require.NoError(t,`
`1355`	`1351`	`os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755),`
`1356`	`1352`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1526,11 +1526,7 @@ alice:x:1000:`
`1526`	`1526`	`additional-group-for-alice:x:11111:alice`
`1527`	`1527`	`additional-group-for-root:x:22222:root`
`1528`	`1528`	`
`1529`		`- tempRootDir, err := os.MkdirTemp("", "TestContainerUser-")`
`1530`		`- require.NoError(t, err)`
`1531`		`- if tempRootDir != "" {`
`1532`		`- defer os.RemoveAll(tempRootDir)`
`1533`		`- }`
	`1529`	`+ tempRootDir := t.TempDir()`
`1534`	`1530`	`require.NoError(t,`
`1535`	`1531`	`os.MkdirAll(filepath.Join(tempRootDir, "etc"), 0755),`
`1536`	`1532`	`)`