Merge pull request #1315 from Juneezee/test/t.TempDir

test: use `T.TempDir` to create temporary test directory
containers · Aug 30, 2022 · a3c0839 · a3c0839
2 parents 5d7035f + 6ea3603
commit a3c0839
Show file tree

Hide file tree

Showing 28 changed files with 256 additions and 658 deletions.
diff --git a/drivers/copy/copy_test.go b/drivers/copy/copy_test.go
@@ -32,13 +32,10 @@ func TestCopyWithoutRange(t *testing.T) {
 }
 
 func TestCopyDir(t *testing.T) {
-	srcDir, err := ioutil.TempDir("", "srcDir")
-	assert.NilError(t, err)
+	srcDir := t.TempDir()
 	populateSrcDir(t, srcDir, 3)
 
-	dstDir, err := ioutil.TempDir("", "testdst")
-	assert.NilError(t, err)
-	defer os.RemoveAll(dstDir)
+	dstDir := t.TempDir()
 
 	assert.Check(t, DirCopy(srcDir, dstDir, Content, false))
 	assert.NilError(t, filepath.Walk(srcDir, func(srcPath string, f os.FileInfo, err error) error {
@@ -110,15 +107,13 @@ func populateSrcDir(t *testing.T, srcDir string, remainingDepth int) {
 }
 
 func doCopyTest(t *testing.T, copyWithFileRange, copyWithFileClone *bool) {
-	dir, err := ioutil.TempDir("", "storage-copy-check")
-	assert.NilError(t, err)
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 	srcFilename := filepath.Join(dir, "srcFilename")
 	dstFilename := filepath.Join(dir, "dstilename")
 
 	r := rand.New(rand.NewSource(0))
 	buf := make([]byte, 1024)
-	_, err = r.Read(buf)
+	_, err := r.Read(buf)
 	assert.NilError(t, err)
 	assert.NilError(t, ioutil.WriteFile(srcFilename, buf, 0777))
 	fileinfo, err := os.Stat(srcFilename)
@@ -133,13 +128,8 @@ func doCopyTest(t *testing.T, copyWithFileRange, copyWithFileClone *bool) {
 func TestCopyHardlink(t *testing.T) {
 	var srcFile1FileInfo, srcFile2FileInfo, dstFile1FileInfo, dstFile2FileInfo unix.Stat_t
 
-	srcDir, err := ioutil.TempDir("", "srcDir")
-	assert.NilError(t, err)
-	defer os.RemoveAll(srcDir)
-
-	dstDir, err := ioutil.TempDir("", "dstDir")
-	assert.NilError(t, err)
-	defer os.RemoveAll(dstDir)
+	srcDir := t.TempDir()
+	dstDir := t.TempDir()
 
 	srcFile1 := filepath.Join(srcDir, "file1")
 	srcFile2 := filepath.Join(srcDir, "file2")

diff --git a/drivers/overlay/overlay_test.go b/drivers/overlay/overlay_test.go
@@ -1,10 +1,9 @@
+//go:build linux
 // +build linux
 
 package overlay
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	graphdriver "github.com/containers/storage/drivers"
@@ -25,11 +24,7 @@ func init() {
 }
 
 func skipIfNaive(t *testing.T) {
-	td, err := ioutil.TempDir("", "naive-check-")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(td)
+	td := t.TempDir()
 
 	if err := doesSupportNativeDiff(td, ""); err != nil {
 		t.Skipf("Cannot run test with naive diff")

diff --git a/images_test.go b/images_test.go
@@ -1,7 +1,6 @@
 package storage
 
 import (
-	"io/ioutil"
 	"testing"
 	"time"
 
@@ -10,9 +9,7 @@ import (
 )
 
 func newTestImageStore(t *testing.T) ImageStore {
-	dir, err := ioutil.TempDir("", "storage")
-	require.Nil(t, err)
-	store, err := newImageStore(dir)
+	store, err := newImageStore(t.TempDir())
 	require.Nil(t, err)
 	return store
 }

diff --git a/pkg/archive/archive_linux_test.go b/pkg/archive/archive_linux_test.go
@@ -22,7 +22,8 @@ import (
 // ├── d2     # opaque, 0750
 // │   └── f1 # empty file, 0660
 // └── d3     # 0700
-//     └── f1 # whiteout, 0000
+//
+//	└── f1 # whiteout, 0000
 func setupOverlayTestDir(t *testing.T, src string) {
 	// Create opaque directory containing single file and permission 0700
 	err := os.Mkdir(filepath.Join(src, "d1"), 0700)
@@ -98,21 +99,13 @@ func TestOverlayTarUntar(t *testing.T) {
 	require.NoError(t, err)
 	defer system.Umask(oldmask)
 
-	src, err := ioutil.TempDir("", "storage-test-overlay-tar-src")
-	require.NoError(t, err)
-	defer os.RemoveAll(src)
-
+	src := t.TempDir()
 	setupOverlayTestDir(t, src)
 
-	lower, err := ioutil.TempDir("", "storage-test-overlay-tar-lower")
-	require.NoError(t, err)
-	defer os.RemoveAll(lower)
-
+	lower := t.TempDir()
 	setupOverlayLowerDir(t, lower)
 
-	dst, err := ioutil.TempDir("", "storage-test-overlay-tar-dst")
-	require.NoError(t, err)
-	defer os.RemoveAll(dst)
+	dst := t.TempDir()
 
 	options := &TarOptions{
 		Compression:    Uncompressed,
@@ -144,21 +137,13 @@ func TestOverlayTarAUFSUntar(t *testing.T) {
 	require.NoError(t, err)
 	defer system.Umask(oldmask)
 
-	src, err := ioutil.TempDir("", "storage-test-overlay-tar-src")
-	require.NoError(t, err)
-	defer os.RemoveAll(src)
-
+	src := t.TempDir()
 	setupOverlayTestDir(t, src)
 
-	lower, err := ioutil.TempDir("", "storage-test-overlay-tar-lower")
-	require.NoError(t, err)
-	defer os.RemoveAll(lower)
-
+	lower := t.TempDir()
 	setupOverlayLowerDir(t, lower)
 
-	dst, err := ioutil.TempDir("", "storage-test-overlay-tar-dst")
-	require.NoError(t, err)
-	defer os.RemoveAll(dst)
+	dst := t.TempDir()
 
 	archive, err := TarWithOptions(src, &TarOptions{
 		Compression:    Uncompressed,
@@ -205,11 +190,9 @@ func TestNestedOverlayWhiteouts(t *testing.T) {
 		require.NoError(t, tw.Close())
 	}()
 
-	dst, err := ioutil.TempDir("", "storage-test-overlay-tar-dst")
-	require.NoError(t, err)
-	defer os.RemoveAll(dst)
+	dst := t.TempDir()
 
-	err = Untar(reader, dst, &TarOptions{
+	err := Untar(reader, dst, &TarOptions{
 		Compression:    Uncompressed,
 		WhiteoutFormat: OverlayWhiteoutFormat,
 	})