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

test: use `T.TempDir` to create temporary test directory

3 files changed, 6 insertions, 25 deletions

diff --git a/libpod/container_internal_linux_test.go b/libpod/container_internal_linux_test.go
index 03095aa58..ed1f63a31 100644
--- a/libpod/container_internal_linux_test.go
+++ b/libpod/container_internal_linux_test.go
@@ -4,8 +4,6 @@
 package libpod
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	spec "github.com/opencontainers/runtime-spec/specs-go"
@@ -13,12 +11,6 @@ import (
 )
 
 func TestGenerateUserPasswdEntry(t *testing.T) {
-	dir, err := ioutil.TempDir("", "libpod_test_")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
 	c := Container{
 		config: &ContainerConfig{
 			Spec: &spec.Spec{},
diff --git a/libpod/container_internal_test.go b/libpod/container_internal_test.go
index 2b50093b2..1b4e62e91 100644
--- a/libpod/container_internal_test.go
+++ b/libpod/container_internal_test.go
@@ -4,10 +4,8 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 	"runtime"
-	"strings"
 	"testing"
 
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
@@ -19,11 +17,7 @@ var hookPath string
 
 func TestPostDeleteHooks(t *testing.T) {
 	ctx := context.Background()
-	dir, err := ioutil.TempDir("", "libpod_test_")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 
 	statePath := filepath.Join(dir, "state")
 	copyPath := filepath.Join(dir, "copy")
@@ -57,12 +51,12 @@ func TestPostDeleteHooks(t *testing.T) {
 			},
 		},
 	}
-	err = c.postDeleteHooks(ctx)
+	err := c.postDeleteHooks(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	stateRegexp := `{"ociVersion":"1\.0\.2-dev","id":"123abc","status":"stopped","bundle":"` + strings.TrimSuffix(os.TempDir(), "/") + `/libpod_test_[0-9]*","annotations":{"a":"b"}}`
+	stateRegexp := `{"ociVersion":"1\.0\.2-dev","id":"123abc","status":"stopped","bundle":"` + dir + `","annotations":{"a":"b"}}`
 	for _, p := range []string{statePath, copyPath} {
 		path := p
 		t.Run(path, func(t *testing.T) {
diff --git a/libpod/lock/file/file_lock_test.go b/libpod/lock/file/file_lock_test.go
index 7ac8bf31a..2d7dded23 100644
--- a/libpod/lock/file/file_lock_test.go
+++ b/libpod/lock/file/file_lock_test.go
@@ -2,7 +2,6 @@ package file
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -13,11 +12,9 @@ import (
 
 // Test that creating and destroying locks work
 func TestCreateAndDeallocate(t *testing.T) {
-	d, err := ioutil.TempDir("", "filelock")
-	assert.NoError(t, err)
-	defer os.RemoveAll(d)
+	d := t.TempDir()
 
-	_, err = OpenFileLock(filepath.Join(d, "locks"))
+	_, err := OpenFileLock(filepath.Join(d, "locks"))
 	assert.Error(t, err)
 
 	l, err := CreateFileLock(filepath.Join(d, "locks"))
@@ -47,9 +44,7 @@ func TestCreateAndDeallocate(t *testing.T) {
 
 // Test that creating and destroying locks work
 func TestLockAndUnlock(t *testing.T) {
-	d, err := ioutil.TempDir("", "filelock")
-	assert.NoError(t, err)
-	defer os.RemoveAll(d)
+	d := t.TempDir()
 
 	l, err := CreateFileLock(filepath.Join(d, "locks"))
 	assert.NoError(t, err)