aboutsummaryrefslogtreecommitdiff
path: root/libpod/lock
diff options
context:
space:
mode:
authorEng Zer Jun <engzerjun@gmail.com>2022-05-05 21:09:41 +0800
committerEng Zer Jun <engzerjun@gmail.com>2022-05-05 21:09:41 +0800
commitcf35168f0a9cf457f0622cd89cff84bdbe610d58 (patch)
treedb3b776a982b2a6b615a2a7c9ee45ea6f89c9776 /libpod/lock
parentb1e9ea38e5a680afb9294cb8a451311991d94765 (diff)
downloadpodman-cf35168f0a9cf457f0622cd89cff84bdbe610d58.tar.gz
podman-cf35168f0a9cf457f0622cd89cff84bdbe610d58.tar.bz2
podman-cf35168f0a9cf457f0622cd89cff84bdbe610d58.zip
test: use `T.TempDir` to create temporary test directory
This commit replaces `ioutil.TempDir` with `t.TempDir` in tests. The directory created by `t.TempDir` is automatically removed when the test and all its subtests complete. Prior to this commit, temporary directory created using `ioutil.TempDir` needs to be removed manually by calling `os.RemoveAll`, which is omitted in some tests. The error handling boilerplate e.g. defer func() { if err := os.RemoveAll(dir); err != nil { t.Fatal(err) } } is also tedious, but `t.TempDir` handles this for us nicely. Reference: https://pkg.go.dev/testing#T.TempDir Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Diffstat (limited to 'libpod/lock')
-rw-r--r--libpod/lock/file/file_lock_test.go11
1 files changed, 3 insertions, 8 deletions
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)