opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-30 01:58:46 +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

24
test/e2e/pause_test.go
View File

@@ -321,10 +321,9 @@ var _ = Describe("Podman pause", func() {
})
It("podman pause --cidfile", func() {
tmpDir := GinkgoT().TempDir()
tmpFile := tmpDir + "cid"
cidFile := filepath.Join(tempdir, "cid")
session := podmanTest.Podman([]string{"create", "--cidfile", tmpFile, ALPINE, "top"})
session := podmanTest.Podman([]string{"create", "--cidfile", cidFile, ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
cid := session.OutputToStringArray()[0]
@@ -333,13 +332,13 @@ var _ = Describe("Podman pause", func() {
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
result := podmanTest.Podman([]string{"pause", "--cidfile", tmpFile})
result := podmanTest.Podman([]string{"pause", "--cidfile", cidFile})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
output := result.OutputToString()
Expect(output).To(ContainSubstring(cid))
result = podmanTest.Podman([]string{"unpause", "--cidfile", tmpFile})
result = podmanTest.Podman([]string{"unpause", "--cidfile", cidFile})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
output = result.OutputToString()
@@ -347,25 +346,22 @@ var _ = Describe("Podman pause", func() {
})
It("podman pause 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")
defer os.RemoveAll(tmpDir)
session := podmanTest.Podman([]string{"run", "--cidfile", tmpFile1, "-d", ALPINE, "top"})
session := podmanTest.Podman([]string{"run", "--cidfile", cidFile1, "-d", ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
cid1 := session.OutputToStringArray()[0]
Expect(podmanTest.NumberOfContainers()).To(Equal(1))
session = podmanTest.Podman([]string{"run", "--cidfile", tmpFile2, "-d", ALPINE, "top"})
session = podmanTest.Podman([]string{"run", "--cidfile", cidFile2, "-d", ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
cid2 := session.OutputToStringArray()[0]
Expect(podmanTest.NumberOfContainers()).To(Equal(2))
result := podmanTest.Podman([]string{"pause", "--cidfile", tmpFile1, "--cidfile", tmpFile2})
result := podmanTest.Podman([]string{"pause", "--cidfile", cidFile1, "--cidfile", cidFile2})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
output := result.OutputToString()
@@ -373,7 +369,7 @@ var _ = Describe("Podman pause", func() {
Expect(output).To(ContainSubstring(cid2))
Expect(podmanTest.NumberOfContainers()).To(Equal(2))
result = podmanTest.Podman([]string{"unpause", "--cidfile", tmpFile1, "--cidfile", tmpFile2})
result = podmanTest.Podman([]string{"unpause", "--cidfile", cidFile1, "--cidfile", cidFile2})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
output = result.OutputToString()