From ea8992cb459846dc63233547b033b280fe1e4c8b Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Tue, 4 Jul 2023 16:36:56 +0200
Subject: [PATCH] test/e2e: use random ImageCacheDir

Like LockTmpDir use a random tmpdir for this directory. Make sure it is
set for all parallel ginkgo processes.

Also GinkgoT().TempDir() will automatcially remove the directory at the
end so we do not need to worry about cleanup.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 test/e2e/common_test.go | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 7ca18d3ab9..8264677a25 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -126,9 +126,18 @@ var (
 	})
 )
 
+const (
+	// lockdir - do not use directly use LockTmpDir
+	lockdir = "libpodlock"
+	// imageCacheDir - do not use directly use ImageCacheDir
+	imageCacheDir = "imagecachedir"
+)
+
 var _ = SynchronizedBeforeSuite(func() []byte {
+	globalTmpDir := GinkgoT().TempDir()
+
 	// make cache dir
-	ImageCacheDir = filepath.Join(os.TempDir(), "imagecachedir")
+	ImageCacheDir = filepath.Join(globalTmpDir, imageCacheDir)
 	if err := os.MkdirAll(ImageCacheDir, 0700); err != nil {
 		GinkgoWriter.Printf("%q\n", err)
 		os.Exit(1)
@@ -155,9 +164,8 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	// tests are remote, this is a no-op
 	populateCache(podman)
 
-	path, err := os.MkdirTemp("", "libpodlock")
-	if err != nil {
-		GinkgoWriter.Println(err)
+	if err := os.MkdirAll(filepath.Join(globalTmpDir, lockdir), 0700); err != nil {
+		GinkgoWriter.Printf("%q\n", err)
 		os.Exit(1)
 	}
 
@@ -169,11 +177,13 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	// remove temporary podman files, images are now cached in ImageCacheDir
 	rmAll(podman.PodmanBinary, podman.TempDir)
 
-	return []byte(path)
+	return []byte(globalTmpDir)
 }, func(data []byte) {
 	cwd, _ := os.Getwd()
 	INTEGRATION_ROOT = filepath.Join(cwd, "../../")
-	LockTmpDir = string(data)
+	globalTmpDir := string(data)
+	ImageCacheDir = filepath.Join(globalTmpDir, imageCacheDir)
+	LockTmpDir = filepath.Join(globalTmpDir, lockdir)
 
 	timingsFile, err = os.Create(fmt.Sprintf("%s/timings-%d", LockTmpDir, GinkgoParallelProcess()))
 	Expect(err).ToNot(HaveOccurred())
@@ -218,9 +228,6 @@ var _ = SynchronizedAfterSuite(func() {
 
 		cwd, _ := os.Getwd()
 		rmAll(getPodmanBinary(cwd), ImageCacheDir)
-
-		// LockTmpDir can already be removed
-		os.RemoveAll(LockTmpDir)
 	})
 
 func getPodmanBinary(cwd string) string {
@@ -314,8 +321,6 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
 		storageOptions = "--storage-driver " + storageFs
 	}
 
-	ImageCacheDir = filepath.Join(os.TempDir(), "imagecachedir")
-
 	p := &PodmanTestIntegration{
 		PodmanTest: PodmanTest{
 			PodmanBinary:       podmanBinary,