opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 03:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

e2e tests: stop littering

Browse Source 
"tmpdir + string" does not do what you think it does.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2024-04-16 14:47:35 -06:00
parent ac963a7036
commit ac04cb4ac5
13 changed files with 92 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/rm_test.go
View File

@ -2,6 +2,7 @@ package integration
import (
"fmt"
"path/filepath"
. "github.com/containers/podman/v5/test/utils"
. "github.com/onsi/ginkgo/v2"
@ -122,16 +123,15 @@ var _ = Describe("Podman rm", func() {
})
It("podman rm --cidfile", func() {
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "cid"
cidFile := filepath.Join(tempdir, "cid")
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile, ALPINE, "ls"})
session := podmanTest.Podman([]string{"create", "--cidfile", cidFile, ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
cid := session.OutputToStringArray()[0]
Expect(podmanTest.NumberOfContainers()).To(Equal(1))
result := podmanTest.Podman([]string{"rm", "--cidfile", tmpFile})
result := podmanTest.Podman([]string{"rm", "--cidfile", cidFile})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
output := result.OutputToString()
@ -140,23 +140,22 @@ var _ = Describe("Podman rm", func() {
})
It("podman rm multiple --cidfile", func() {
tmpDir := GinkgoT().TempDir()
tmpFile1 := tmpDir + "cid-1"
tmpFile2 := tmpDir + "cid-2"
cidFile1 := filepath.Join(tempdir, "cid-1")
cidFile2 := filepath.Join(tempdir, "cid-2")
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile1, ALPINE, "ls"})
session := podmanTest.Podman([]string{"create", "--cidfile", cidFile1, ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
cid1 := session.OutputToStringArray()[0]
Expect(podmanTest.NumberOfContainers()).To(Equal(1))
session = podmanTest.Podman([]string{"create", "--cidfile", tmpFile2, ALPINE, "ls"})
session = podmanTest.Podman([]string{"create", "--cidfile", cidFile2, ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
cid2 := session.OutputToStringArray()[0]
Expect(podmanTest.NumberOfContainers()).To(Equal(2))
result := podmanTest.Podman([]string{"rm", "--cidfile", tmpFile1, "--cidfile", tmpFile2})
result := podmanTest.Podman([]string{"rm", "--cidfile", cidFile1, "--cidfile", cidFile2})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
output := result.OutputToString()