containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use all of tempdir as podman's --tmpdir 

... because (podman system reset) will delete all of it,
interfering with the test storing other data in the directory.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2025-01-13 22:07:07 +01:00
parent 2d42b13d55
commit 27ccfef3a1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/common_test.go
View File

@ -114,7 +114,10 @@ var (
_ = BeforeEach(func() { _ = BeforeEach(func() {
tempdir, err = os.MkdirTemp(GlobalTmpDir, "subtest-") tempdir, err = os.MkdirTemp(GlobalTmpDir, "subtest-")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
podmanTest = PodmanTestCreate(tempdir) podmanTempDir := filepath.Join(tempdir, "p")
err = os.Mkdir(podmanTempDir, 0o700)
Expect(err).ToNot(HaveOccurred())
podmanTest = PodmanTestCreate(podmanTempDir)
podmanTest.Setup() podmanTest.Setup()
// see GetSafeIPAddress() below // see GetSafeIPAddress() below
safeIPOctets[0] = uint8(GinkgoT().ParallelProcess()) + 128 safeIPOctets[0] = uint8(GinkgoT().ParallelProcess()) + 128

2
test/e2e/run_transient_test.go
View File

@ -22,7 +22,7 @@ var _ = Describe("Podman run with volumes", func() {
containerStorageDir = filepath.Join(podmanTest.Root, podmanTest.ImageCacheFS+"-containers") containerStorageDir = filepath.Join(podmanTest.Root, podmanTest.ImageCacheFS+"-containers")
dbDir = filepath.Join(podmanTest.Root, "libpod") dbDir = filepath.Join(podmanTest.Root, "libpod")
runContainerStorageDir = filepath.Join(podmanTest.RunRoot, podmanTest.ImageCacheFS+"-containers") runContainerStorageDir = filepath.Join(podmanTest.RunRoot, podmanTest.ImageCacheFS+"-containers")
runDBDir = tempdir runDBDir = podmanTest.TempDir
}) })
It("podman run with no transient-store", func() { It("podman run with no transient-store", func() {