diff options
author | Eng Zer Jun <engzerjun@gmail.com> | 2022-05-05 21:09:41 +0800 |
---|---|---|
committer | Eng Zer Jun <engzerjun@gmail.com> | 2022-05-05 21:09:41 +0800 |
commit | cf35168f0a9cf457f0622cd89cff84bdbe610d58 (patch) | |
tree | db3b776a982b2a6b615a2a7c9ee45ea6f89c9776 /pkg/hooks/hooks_test.go | |
parent | b1e9ea38e5a680afb9294cb8a451311991d94765 (diff) | |
download | podman-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 'pkg/hooks/hooks_test.go')
-rw-r--r-- | pkg/hooks/hooks_test.go | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkg/hooks/hooks_test.go b/pkg/hooks/hooks_test.go index fb3c63250..d5d0c2a32 100644 --- a/pkg/hooks/hooks_test.go +++ b/pkg/hooks/hooks_test.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io/ioutil" - "os" "path/filepath" "runtime" "testing" @@ -20,11 +19,7 @@ var path string func TestGoodNew(t *testing.T) { ctx := context.Background() - dir, err := ioutil.TempDir("", "hooks-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) + dir := t.TempDir() for i, name := range []string{ "01-my-hook.json", @@ -36,7 +31,7 @@ func TestGoodNew(t *testing.T) { if i == 0 { extraStages = ", \"poststart\", \"poststop\"" } - err = ioutil.WriteFile(jsonPath, []byte(fmt.Sprintf("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"%s\", \"timeout\": %d}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"%s]}", path, i+1, extraStages)), 0644) + err := ioutil.WriteFile(jsonPath, []byte(fmt.Sprintf("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"%s\", \"timeout\": %d}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"%s]}", path, i+1, extraStages)), 0644) if err != nil { t.Fatal(err) } @@ -92,14 +87,10 @@ func TestGoodNew(t *testing.T) { func TestBadNew(t *testing.T) { ctx := context.Background() - dir, err := ioutil.TempDir("", "hooks-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) + dir := t.TempDir() jsonPath := filepath.Join(dir, "a.json") - err = ioutil.WriteFile(jsonPath, []byte("{\"version\": \"-1\"}"), 0644) + err := ioutil.WriteFile(jsonPath, []byte("{\"version\": \"-1\"}"), 0644) if err != nil { t.Fatal(err) } |