diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-13 11:00:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-13 11:00:48 +0200 |
| commit | 6ecf33a4cdf93f0e190846e607ca239b692ec7e3 (patch) | |
| tree | 44ae74ec2e1f7694290e9243bead6ffb6a0025d7 /test/e2e/build_test.go | |
| parent | 9cf38a0afbb2619b6eeacce7fade451b38e5bab6 (diff) | |
| parent | b8103640a26e807825e302a3eb025fdf6023ba29 (diff) | |
| download | podman-6ecf33a4cdf93f0e190846e607ca239b692ec7e3.tar.gz podman-6ecf33a4cdf93f0e190846e607ca239b692ec7e3.tar.bz2 podman-6ecf33a4cdf93f0e190846e607ca239b692ec7e3.zip | |
Merge pull request #14227 from rhatdan/test
Make sure tests are cleaned up when they complete
Diffstat (limited to 'test/e2e/build_test.go')
| -rw-r--r-- | test/e2e/build_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index b5cec5fff..dcdd17143 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -786,17 +786,18 @@ RUN ls /dev/test1`, ALPINE) It("podman build use absolute path even if given relative", func() { containerFile := fmt.Sprintf(`FROM %s`, ALPINE) - err = os.Mkdir("relative", 0755) + relativeDir := filepath.Join(podmanTest.TempDir, "relativeDir") + containerFilePath := filepath.Join(relativeDir, "Containerfile") + buildRoot := filepath.Join(relativeDir, "build-root") + + err = os.Mkdir(relativeDir, 0755) Expect(err).To(BeNil()) - containerFilePath := filepath.Join("relative", "Containerfile") - err = os.Mkdir("relative/build-root", 0755) + err = os.Mkdir(buildRoot, 0755) Expect(err).To(BeNil()) err = ioutil.WriteFile(containerFilePath, []byte(containerFile), 0755) Expect(err).To(BeNil()) - build := podmanTest.Podman([]string{"build", "-f", "./relative/Containerfile", "./relative/build-root"}) + build := podmanTest.Podman([]string{"build", "-f", containerFilePath, buildRoot}) build.WaitWithDefaultTimeout() Expect(build).To(Exit(0)) - err = os.RemoveAll("relative") - Expect(err).To(BeNil()) }) }) |