opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/cp_test.go
View File

@ -243,8 +243,7 @@ var _ = Describe("Podman cp", func() {
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
session = podmanTest.Podman([]string{"cp", container + ":/", tmpDir})
session.WaitWithDefaultTimeout()

4
test/e2e/create_test.go
View File

@ -204,9 +204,7 @@ var _ = Describe("Podman create", func() {
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(125))
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpDir)
tmpDir := GinkgoT().TempDir()
podName := "rudolph"
ctrName := "prancer"

5
test/e2e/generate_kube_test.go
View File

@ -1382,10 +1382,7 @@ USER test1`
})
It("podman generate kube omit secret if empty", func() {
dir, err := os.MkdirTemp(tempdir, "podman")
Expect(err).ShouldNot(HaveOccurred())
defer os.RemoveAll(dir)
dir := GinkgoT().TempDir()
podCreate := podmanTest.Podman([]string{"run", "-d", "--pod", "new:" + "noSecretsPod", "--name", "noSecretsCtr", "--volume", dir + ":/foobar", ALPINE})
podCreate.WaitWithDefaultTimeout()

4
test/e2e/generate_systemd_test.go
View File

@ -544,10 +544,8 @@ var _ = Describe("Podman generate systemd", func() {
})
It("podman generate systemd pod with containers --new", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "podID"
defer os.RemoveAll(tmpDir)
n := podmanTest.Podman([]string{"pod", "create", "--pod-id-file", tmpFile, "--name", "foo"})
n.WaitWithDefaultTimeout()

14
test/e2e/kill_test.go
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()

8
test/e2e/pause_test.go
View File

@ -321,12 +321,9 @@ var _ = Describe("Podman pause", func() {
})
It("podman pause --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "cid"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile, ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@ -350,8 +347,7 @@ var _ = Describe("Podman pause", func() {
})
It("podman pause multiple --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile1 := tmpDir + "cid-1"
tmpFile2 := tmpDir + "cid-2"

5
test/e2e/play_kube_test.go
View File

@ -1729,10 +1729,7 @@ func milliCPUToQuota(milliCPU string) int {
}
func createSourceTarFile(fileName, fileContent, tarFilePath string) error {
dir, err := os.MkdirTemp("", "podmanTest")
if err != nil {
return err
}
dir := GinkgoT().TempDir()
file, err := os.Create(filepath.Join(dir, fileName))
if err != nil {

8
test/e2e/pod_rm_test.go
View File

@ -215,10 +215,8 @@ var _ = Describe("Podman pod rm", func() {
})
It("podman pod start/remove single pod via --pod-id-file", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "podID"
defer os.RemoveAll(tmpDir)
podName := "rudolph"
@ -244,9 +242,7 @@ var _ = Describe("Podman pod rm", func() {
})
It("podman pod start/remove multiple pods via --pod-id-file", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpDir)
tmpDir := GinkgoT().TempDir()
podIDFiles := []string{}
for _, i := range "0123456789" {

12
test/e2e/pod_start_test.go
View File

@ -153,10 +153,8 @@ var _ = Describe("Podman pod start", func() {
})
It("podman pod start single pod via --pod-id-file", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "podID"
defer os.RemoveAll(tmpDir)
podName := "rudolph"
@ -177,9 +175,7 @@ var _ = Describe("Podman pod start", func() {
})
It("podman pod start multiple pods via --pod-id-file", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpDir)
tmpDir := GinkgoT().TempDir()
podIDFiles := []string{}
for _, i := range "0123456789" {
@ -209,10 +205,8 @@ var _ = Describe("Podman pod start", func() {
})
It("podman pod create --infra-conmon-pod create + start", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "podID"
defer os.RemoveAll(tmpDir)
podName := "rudolph"
// Create a pod with --infra-conmon-pid.

10
test/e2e/pod_stop_test.go
View File

@ -1,8 +1,6 @@
package integration
import (
"os"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
@ -158,10 +156,8 @@ var _ = Describe("Podman pod stop", func() {
})
It("podman pod start/stop single pod via --pod-id-file", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "podID"
defer os.RemoveAll(tmpDir)
podName := "rudolph"
@ -187,9 +183,7 @@ var _ = Describe("Podman pod stop", func() {
})
It("podman pod start/stop multiple pods via --pod-id-file", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpDir)
tmpDir := GinkgoT().TempDir()
podIDFiles := []string{}
for _, i := range "0123456789" {

11
test/e2e/restart_test.go
View File

@ -2,7 +2,6 @@ package integration
import (
"fmt"
"os"
"time"
. "github.com/containers/podman/v4/test/utils"
@ -229,12 +228,9 @@ var _ = Describe("Podman restart", func() {
})
It("podman restart --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "cid"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile, ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@ -252,13 +248,10 @@ var _ = Describe("Podman restart", func() {
})
It("podman restart multiple --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile1 := tmpDir + "cid-1"
tmpFile2 := tmpDir + "cid-2"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"run", "--cidfile", tmpFile1, "-d", ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))

11
test/e2e/rm_test.go
View File

@ -2,7 +2,6 @@ package integration
import (
"fmt"
"os"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
@ -122,12 +121,9 @@ var _ = Describe("Podman rm", func() {
})
It("podman rm --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "cid"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile, ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@ -143,13 +139,10 @@ var _ = Describe("Podman rm", func() {
})
It("podman rm multiple --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile1 := tmpDir + "cid-1"
tmpFile2 := tmpDir + "cid-2"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile1, ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))

13
test/e2e/stop_test.go
View File

@ -2,7 +2,6 @@ package integration
import (
"fmt"
"os"
"strings"
. "github.com/onsi/ginkgo/v2"
@ -258,13 +257,9 @@ var _ = Describe("Podman stop", func() {
})
It("podman stop --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "cid"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile, ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
@ -282,14 +277,10 @@ var _ = Describe("Podman stop", func() {
})
It("podman stop multiple --cidfile", func() {
tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred())
tmpDir := GinkgoT().TempDir()
tmpFile1 := tmpDir + "cid-1"
tmpFile2 := tmpDir + "cid-2"
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"run", "--cidfile", tmpFile1, "-d", ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))