e2e tests: use actual temp dirs, not "/tmp/dir"

One of the --iidfile tests was flaking:

   Error: failed to write image ID to file "/tmp/dir/idFile": open /tmp/dir/idFile: no such file or directory

Root cause: test was actually not mkdir'ing /tmp/dir. Test was
mostly passing because _other_ tests in the suite were mkdir'ing
it, but once in a while this test ran before the others.

Solution: fixed this test to use CreateTempDirInTempDir(). And,
since hardcoded tempdirs are bad practice, grepped for '"dir"'
and fixed all other instances too.

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 8 insertions, 3 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})