From 3ac98722306c316223169fa4a0f9a2769bcceb65 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Wed, 1 May 2019 13:06:52 +0200
Subject: tests: split testParentDir by UID

When we run tests as root, they will leave root-owned files
in testParentDir, which causes trouble when we run tests as
a normal user later on. Split by UID.
---
 tests/test_helpers/helpers.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/test_helpers')

diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index fd36f76..7275997 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -59,8 +59,8 @@ func init() {
 func doInit() {
 	X255 = string(bytes.Repeat([]byte("X"), 255))
 	MountInfo = make(map[string]mountInfo)
-
-	testParentDir := os.TempDir() + "/gocryptfs-test-parent"
+	// Something like /tmp/gocryptfs-test-parent-1234
+	testParentDir := fmt.Sprintf("%s/gocryptfs-test-parent-%d", os.TempDir(), os.Getuid())
 	os.MkdirAll(testParentDir, 0700)
 	var err error
 	TmpDir, err = ioutil.TempDir(testParentDir, "")
-- 
cgit v1.2.3