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č <[email protected]>
containers · Jan 22, 2025 · b118d64 · b118d64
1 parent abea0de
commit b118d64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
@@ -113,7 +113,10 @@ var (
 	_ = BeforeEach(func() {
 		tempdir, err = os.MkdirTemp(GlobalTmpDir, "subtest-")
 		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()
 		// see GetSafeIPAddress() below
 		safeIPOctets[0] = uint8(GinkgoT().ParallelProcess()) + 128

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