diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-06 04:58:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 04:58:25 -0400 |
| commit | 5d5cb402cb6be818d6efd52d2198b00a55df0f1b (patch) | |
| tree | 761cf9f6dbcff5aa0551737dd3c11b1aa4a20a6f /pkg/hooks/read_test.go | |
| parent | 8ba679fc37fe62e7af31611e47b09a6c4b11f3a9 (diff) | |
| parent | d7f43e6772b734d0a7a7533bf94a61939ac1ebe5 (diff) | |
| download | podman-5d5cb402cb6be818d6efd52d2198b00a55df0f1b.tar.gz podman-5d5cb402cb6be818d6efd52d2198b00a55df0f1b.tar.bz2 podman-5d5cb402cb6be818d6efd52d2198b00a55df0f1b.zip | |
Merge pull request #14129 from Juneezee/test/t.TempDir
test: use `T.TempDir` to create temporary test directory
Diffstat (limited to 'pkg/hooks/read_test.go')
| -rw-r--r-- | pkg/hooks/read_test.go | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/pkg/hooks/read_test.go b/pkg/hooks/read_test.go index 6e6c190bb..381d66bbe 100644 --- a/pkg/hooks/read_test.go +++ b/pkg/hooks/read_test.go @@ -29,14 +29,10 @@ func TestUnknownPath(t *testing.T) { } func TestGoodFile(t *testing.T) { - dir, err := ioutil.TempDir("", "hooks-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) + dir := t.TempDir() jsonPath := filepath.Join(dir, "hook.json") - err = ioutil.WriteFile(jsonPath, []byte(fmt.Sprintf("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"%s\"}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}", path)), 0644) + err := ioutil.WriteFile(jsonPath, []byte(fmt.Sprintf("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"%s\"}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}", path)), 0644) if err != nil { t.Fatal(err) } @@ -59,14 +55,10 @@ func TestGoodFile(t *testing.T) { } func TestBadFile(t *testing.T) { - dir, err := ioutil.TempDir("", "hooks-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) + dir := t.TempDir() path := filepath.Join(dir, "hook.json") - err = ioutil.WriteFile(path, []byte("{\"version\": \"1.0.0\", \"hook\": \"not-a-string\"}"), 0644) + err := ioutil.WriteFile(path, []byte("{\"version\": \"1.0.0\", \"hook\": \"not-a-string\"}"), 0644) if err != nil { t.Fatal(err) } @@ -121,13 +113,9 @@ func TestInvalidCurrentJSON(t *testing.T) { } func TestGoodDir(t *testing.T) { - dir, err := ioutil.TempDir("", "hooks-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) + dir := t.TempDir() - err = ioutil.WriteFile(filepath.Join(dir, "README"), []byte("not a hook"), 0644) + err := ioutil.WriteFile(filepath.Join(dir, "README"), []byte("not a hook"), 0644) if err != nil { t.Fatal(err) } @@ -172,14 +160,10 @@ func TestUnknownDir(t *testing.T) { } func TestBadDir(t *testing.T) { - 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) } @@ -193,14 +177,10 @@ func TestBadDir(t *testing.T) { } func TestHookExecutableDoesNotExit(t *testing.T) { - dir, err := ioutil.TempDir("", "hooks-test-") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(dir) + dir := t.TempDir() jsonPath := filepath.Join(dir, "hook.json") - err = ioutil.WriteFile(jsonPath, []byte("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"/does/not/exist\"}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}"), 0644) + err := ioutil.WriteFile(jsonPath, []byte("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"/does/not/exist\"}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}"), 0644) if err != nil { t.Fatal(err) } |