test/e2e: use GinkgoT().TempDir() over MkdirTemp()

Using GinkgoT().TempDir() will automatically result in the directy to be
cleaned up when the test is done. This should help to prevent leaking
files and we do not need to error check every time.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-07-04 17:07:14 +02:00
parent ea8992cb45
commit fc5aa9c9ca
13 changed files with 23 additions and 85 deletions

View File

@ -1,8 +1,6 @@
package integration
import (
"os"
. "github.com/containers/podman/v4/test/utils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
@ -128,10 +126,8 @@ var _ = Describe("Podman kill", func() {
})
It("podman kill --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "cid"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"run", "-dt", "--cidfile", tmpFile, ALPINE, "top"})
session.WaitWithDefaultTimeout()
@ -148,15 +144,11 @@ var _ = Describe("Podman kill", func() {
})
It("podman kill multiple --cidfile", func() {
tmpDir1, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir1 := GinkgoT().TempDir()
tmpFile1 := tmpDir1 + "cid"
defer os.RemoveAll(tmpDir1)
tmpDir2, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir2 := GinkgoT().TempDir()
tmpFile2 := tmpDir2 + "cid"
defer os.RemoveAll(tmpDir2)
session := podmanTest.Podman([]string{"run", "-dt", "--cidfile", tmpFile1, ALPINE, "top"})
session.WaitWithDefaultTimeout()