diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-18 20:52:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 20:52:44 +0200 |
| commit | ff1f81b14a2944a1651e1b404681972ff3483d36 (patch) | |
| tree | 05a830691cbea0575da682b1cbaf62c667572c04 /test/e2e | |
| parent | 7995f85f7559af9d69adaaa9061bd5c0c7f0d974 (diff) | |
| parent | bc07e1ba708f38b6ea21204b4b0ef9d777c0fcc5 (diff) | |
| download | podman-ff1f81b14a2944a1651e1b404681972ff3483d36.tar.gz podman-ff1f81b14a2944a1651e1b404681972ff3483d36.tar.bz2 podman-ff1f81b14a2944a1651e1b404681972ff3483d36.zip | |
Merge pull request #7341 from edsantiago/e2e_use_tmpdirs
e2e tests: use actual temp dirs, not "/tmp/dir"
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/build_test.go | 11 | ||||
| -rw-r--r-- | test/e2e/commit_test.go | 6 | ||||
| -rw-r--r-- | test/e2e/pod_create_test.go | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 1046ffcea..9fd82e149 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -127,8 +127,10 @@ var _ = Describe("Podman build", func() { defer Expect(os.Chdir(cwd)).To(BeNil()) // Write target and fake files - targetPath := filepath.Join(os.TempDir(), "dir") - Expect(os.MkdirAll(targetPath, 0755)).To(BeNil()) + targetPath, err := CreateTempDirInTempDir() + if err != nil { + os.Exit(1) + } fakeFile := filepath.Join(os.TempDir(), "Containerfile") Expect(ioutil.WriteFile(fakeFile, []byte("FROM alpine"), 0755)).To(BeNil()) @@ -162,7 +164,10 @@ var _ = Describe("Podman build", func() { Expect(os.Chdir(os.TempDir())).To(BeNil()) defer Expect(os.Chdir(cwd)).To(BeNil()) - targetPath := filepath.Join(os.TempDir(), "dir") + targetPath, err := CreateTempDirInTempDir() + if err != nil { + os.Exit(1) + } targetFile := filepath.Join(targetPath, "idFile") session := podmanTest.PodmanNoCache([]string{"build", "build/basicalpine", "--iidfile", targetFile}) diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index c122ce50f..c1a213c00 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -257,8 +257,10 @@ var _ = Describe("Podman commit", func() { cwd, err := os.Getwd() Expect(err).To(BeNil()) Expect(os.Chdir(os.TempDir())).To(BeNil()) - targetPath := filepath.Join(os.TempDir(), "dir") - Expect(os.MkdirAll(targetPath, 0755)).To(BeNil()) + targetPath, err := CreateTempDirInTempDir() + if err != nil { + os.Exit(1) + } targetFile := filepath.Join(targetPath, "idFile") defer Expect(os.RemoveAll(targetFile)).To(BeNil()) defer Expect(os.Chdir(cwd)).To(BeNil()) diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 5c9b41c62..f260a123a 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -296,8 +296,10 @@ var _ = Describe("Podman pod create", func() { cwd, err := os.Getwd() Expect(err).To(BeNil()) Expect(os.Chdir(os.TempDir())).To(BeNil()) - targetPath := filepath.Join(os.TempDir(), "dir") - Expect(os.MkdirAll(targetPath, 0755)).To(BeNil()) + targetPath, err := CreateTempDirInTempDir() + if err != nil { + os.Exit(1) + } targetFile := filepath.Join(targetPath, "idFile") defer Expect(os.RemoveAll(targetFile)).To(BeNil()) defer Expect(os.Chdir(cwd)).To(BeNil()) |