mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-08-26 10:17:53 +00:00
test/e2e: close and remove temp file before cp in cp_test
Close the temporary destination file and remove it before copying to avoid issues with copying to an existing open file. Store the filename in a variable for reuse and defer cleanup. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
parent
3a48ef139c
commit
0c845dd40d
1 changed files with 12 additions and 8 deletions
|
|
@ -73,10 +73,12 @@ var _ = Describe("Podman cp", func() {
|
|||
|
||||
destFile, err := os.CreateTemp("", "")
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
defer destFile.Close()
|
||||
defer os.Remove(destFile.Name())
|
||||
destFileName := destFile.Name()
|
||||
destFile.Close()
|
||||
os.Remove(destFileName)
|
||||
defer os.Remove(destFileName)
|
||||
|
||||
session = podmanTest.Podman([]string{"cp", name + ":foo", destFile.Name()})
|
||||
session = podmanTest.Podman([]string{"cp", name + ":foo", destFileName})
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
|
||||
|
|
@ -85,7 +87,7 @@ var _ = Describe("Podman cp", func() {
|
|||
Expect(session).Should(Exit(0))
|
||||
|
||||
// Now make sure the content matches.
|
||||
roundtripContent, err := os.ReadFile(destFile.Name())
|
||||
roundtripContent, err := os.ReadFile(destFileName)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(roundtripContent).To(Equal(originalContent))
|
||||
})
|
||||
|
|
@ -122,15 +124,17 @@ var _ = Describe("Podman cp", func() {
|
|||
|
||||
destFile, err := os.CreateTemp("", "")
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
defer destFile.Close()
|
||||
defer os.Remove(destFile.Name())
|
||||
destFileName := destFile.Name()
|
||||
destFile.Close()
|
||||
os.Remove(destFileName)
|
||||
defer os.Remove(destFileName)
|
||||
|
||||
session = podmanTest.Podman([]string{"cp", name + ":foo", destFile.Name()})
|
||||
session = podmanTest.Podman([]string{"cp", name + ":foo", destFileName})
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
|
||||
// Now make sure the content matches.
|
||||
roundtripContent, err := os.ReadFile(destFile.Name())
|
||||
roundtripContent, err := os.ReadFile(destFileName)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(roundtripContent).To(Equal(originalContent))
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue