diff options
author | Arne Juul <arnej@yahooinc.com> | 2022-12-06 13:18:16 +0100 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2022-12-06 13:19:42 +0100 |
commit | 17953ae2cdc69e08e3446c45360ebeff143849cc (patch) | |
tree | 4e00d5eab119e5696751428670e3504775bb186e /client | |
parent | 7b6933c4600506d307b60f7076d0c892698f7ad5 (diff) |
avoid symlink-related problems
Diffstat (limited to 'client')
-rw-r--r-- | client/go/util/fix_fs_test.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/go/util/fix_fs_test.go b/client/go/util/fix_fs_test.go index 8696359ea19..1f0d317957d 100644 --- a/client/go/util/fix_fs_test.go +++ b/client/go/util/fix_fs_test.go @@ -2,9 +2,9 @@ package util import ( - "fmt" "os" "os/user" + "path/filepath" "strconv" "testing" @@ -13,7 +13,8 @@ import ( ) func setup(t *testing.T) string { - tmpDir := t.TempDir() + tt := t.TempDir() + tmpDir, _ := filepath.EvalSymlinks(tt) err := os.MkdirAll(tmpDir+"/a", 0755) assert.Nil(t, err) err = os.MkdirAll(tmpDir+"/a/bad", 0) @@ -81,7 +82,7 @@ func TestSimpleFixes(t *testing.T) { } func TestSuperUserOnly(t *testing.T) { - trace.AdjustVerbosity(2) + trace.AdjustVerbosity(0) var userId int = -1 var groupId int = -1 if os.Getuid() != 0 { @@ -118,7 +119,7 @@ func TestSuperUserOnly(t *testing.T) { func expectSimplePanic() { if r := recover(); r != nil { if jee, ok := r.(*JustExitError); ok { - fmt.Fprintln(os.Stderr, "got as expected:", jee) + trace.Trace("got as expected:", jee) return } panic(r) |